Merge branch 'develop' of github.com:martini/zammad into develop
This commit is contained in:
commit
7380fa9e9b
3 changed files with 17 additions and 2 deletions
2
Gemfile
2
Gemfile
|
@ -14,7 +14,7 @@ gem 'json'
|
||||||
# Gems used only for assets and not required
|
# Gems used only for assets and not required
|
||||||
# in production environments by default.
|
# in production environments by default.
|
||||||
group :assets do
|
group :assets do
|
||||||
gem 'sass-rails'
|
gem 'sass-rails', github: 'rails/sass-rails'
|
||||||
gem 'coffee-rails'
|
gem 'coffee-rails'
|
||||||
gem 'uglifier'
|
gem 'uglifier'
|
||||||
end
|
end
|
||||||
|
|
|
@ -25,7 +25,7 @@ Getting Started
|
||||||
|
|
||||||
```
|
```
|
||||||
zammad@shell> cd zammad
|
zammad@shell> cd zammad
|
||||||
zammad@shell> gem install rails
|
zammad@shell> gem install rails
|
||||||
zammad@shell> vi Gemfile # enable libv8, execjs and therubyracer if needed!
|
zammad@shell> vi Gemfile # enable libv8, execjs and therubyracer if needed!
|
||||||
zammad@shell> sudo bundle install
|
zammad@shell> sudo bundle install
|
||||||
```
|
```
|
||||||
|
|
15
script/install.sh
Normal file
15
script/install.sh
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
#!/bin/bash
|
||||||
|
get_distro(){
|
||||||
|
arch=$(uname -m)
|
||||||
|
kernel=$(uname -r)
|
||||||
|
if [ -f /etc/lsb-release ]; then
|
||||||
|
os=$(lsb_release -s -d)
|
||||||
|
elif [ -f /etc/debian_version ]; then
|
||||||
|
os="Debian $(cat /etc/debian_version)"
|
||||||
|
elif [ -f /etc/redhat-release ]; then
|
||||||
|
os=`cat /etc/redhat-release`
|
||||||
|
else
|
||||||
|
os="$(uname -s) $(uname -r)"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue