Description:
Update install.sh
revert back to use single user rvm instead
also fix the secret file generating script
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Author
-
r267:a92e27ea4e22 - - 1 file changed: 15 inserted, 23 deleted
| @@ -9,10 +9,8 | |||
|
|
9 | 9 | |
|
|
10 | 10 | echo "Installing required apts" |
|
|
11 | 11 | |
|
|
12 | - sudo apt-get install software-properties-common | |
|
|
13 | - sudo apt-add-repository -y ppa:rael-gc/rvm | |
|
|
14 | 12 | sudo apt-get update |
|
|
15 |
- sudo apt-get install |
|
|
|
13 | + sudo apt-get install mysql-server mysql-client \ | |
|
|
16 | 14 | g++ gcc apache2 libmysqlclient20 build-essential \ |
|
|
17 | 15 | git-core openssl libreadline6 libreadline6-dev \ |
|
|
18 | 16 | zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev \ |
| @@ -21,13 +19,9 | |||
|
|
21 | 19 | pkg-config curl nodejs unzip pyflakes ruby default-jdk \ |
|
|
22 | 20 | libmysqld-dev mercurial python-setuptools python-dev python3-numpy |
|
|
23 | 21 | |
|
|
24 | - #--- edited -- | |
|
|
25 | - #--- we now use rvm from ubuntu package --- | |
|
|
26 | - #echo "Installing RVM" | |
|
|
27 | - #curl -k -L https://get.rvm.io | bash -s stable | |
|
|
28 | - #source ~/.rvm/scripts/rvm | |
|
|
29 | - | |
|
|
30 | - source /etc/profile.d/rvm.sh | |
|
|
22 | + echo "Installing RVM" | |
|
|
23 | + curl -k -L https://get.rvm.io | bash -s stable | |
|
|
24 | + source ~/.rvm/scripts/rvm | |
|
|
31 | 25 | |
|
|
32 | 26 | echo "Installing Ruby $RUBY_VERSION in RVM" |
|
|
33 | 27 | |
| @@ -127,19 +121,6 | |||
|
|
127 | 121 | echo "GRADER_ROOT_DIR = '$CAFE_PATH/judge'" >> config/initializers/cafe_grader_config.rb |
|
|
128 | 122 | echo "GRADING_RESULT_DIR = '$CAFE_PATH/judge/result'" >> config/initializers/cafe_grader_config.rb |
|
|
129 | 123 | |
|
|
130 | - # setup secret file | |
|
|
131 | - SECRET_A=`rake secret` | |
|
|
132 | - SECRET_B=`rake secret` | |
|
|
133 | - SECRET_C=`rake secret` | |
|
|
134 | - echo "development:" > config/secrets.yml | |
|
|
135 | - echo " secret_key_base: '$SECRET_A'" >> config/secrets.yml | |
|
|
136 | - echo "test:" >> config/secrets.yml | |
|
|
137 | - echo " secret_key_base: '$SECRET_B'" >> config/secrets.yml | |
|
|
138 | - echo "production:" >> config/secrets.yml | |
|
|
139 | - echo " secret_key_base: '$SECRET_C'" >> config/secrets.yml | |
|
|
140 | - | |
|
|
141 | - | |
|
|
142 | - | |
|
|
143 | 124 | echo "Installing required gems" |
|
|
144 | 125 | gem install bundler |
|
|
145 | 126 | bundle install |
| @@ -153,6 +134,17 | |||
|
|
153 | 134 | |
|
|
154 | 135 | rake assets:precompile |
|
|
155 | 136 | |
|
|
137 | + echo "setup the secret file" | |
|
|
138 | + SECRET_A=`rake secret` | |
|
|
139 | + SECRET_B=`rake secret` | |
|
|
140 | + SECRET_C=`rake secret` | |
|
|
141 | + echo "development:" > config/secrets.yml | |
|
|
142 | + echo " secret_key_base: '$SECRET_A'" >> config/secrets.yml | |
|
|
143 | + echo "test:" >> config/secrets.yml | |
|
|
144 | + echo " secret_key_base: '$SECRET_B'" >> config/secrets.yml | |
|
|
145 | + echo "production:" >> config/secrets.yml | |
|
|
146 | + echo " secret_key_base: '$SECRET_C'" >> config/secrets.yml | |
|
|
147 | + | |
|
|
156 | 148 | echo "Intalling web interface complete..." |
|
|
157 | 149 | echo |
|
|
158 | 150 | echo "Fetching grader" |
You need to be logged in to leave comments.
Login now