# HG changeset patch
# User Nattee Niparnan <nattee@gmail.com>
# Date 2017-09-05 10:09:27
# Node ID a92e27ea4e225dfcdd8bc50aca8b819e98538383
# Parent  88b545da976a7028123835501b0012edeb1dd3f7

Update install.sh

revert back to use single user rvm instead
also fix the secret file generating script

diff --git a/installer/install.sh b/installer/install.sh
--- a/installer/install.sh
+++ b/installer/install.sh
@@ -9,10 +9,8 @@
 
 echo "Installing required apts"
 
-sudo apt-get install software-properties-common
-sudo apt-add-repository -y ppa:rael-gc/rvm
 sudo apt-get update
-sudo apt-get install rvm mysql-server mysql-client \
+sudo apt-get install mysql-server mysql-client \
   g++ gcc apache2 libmysqlclient20 build-essential \
   git-core openssl libreadline6 libreadline6-dev \
   zlib1g zlib1g-dev libssl-dev libyaml-dev libsqlite3-dev \
@@ -21,13 +19,9 @@
   pkg-config curl nodejs unzip pyflakes ruby default-jdk \
   libmysqld-dev mercurial python-setuptools python-dev python3-numpy
 
-#--- edited -- 
-#--- we now use rvm from ubuntu package ---
-#echo "Installing RVM"
-#curl -k -L https://get.rvm.io | bash -s stable
-#source ~/.rvm/scripts/rvm
-
-source /etc/profile.d/rvm.sh
+echo "Installing RVM"
+curl -k -L https://get.rvm.io | bash -s stable
+source ~/.rvm/scripts/rvm
 
 echo "Installing Ruby $RUBY_VERSION in RVM"
 
@@ -127,19 +121,6 @@
 echo "GRADER_ROOT_DIR = '$CAFE_PATH/judge'" >> config/initializers/cafe_grader_config.rb
 echo "GRADING_RESULT_DIR = '$CAFE_PATH/judge/result'" >> config/initializers/cafe_grader_config.rb
 
-# setup secret file
-SECRET_A=`rake secret`
-SECRET_B=`rake secret`
-SECRET_C=`rake secret`
-echo "development:" > config/secrets.yml
-echo "  secret_key_base: '$SECRET_A'" >> config/secrets.yml
-echo "test:" >> config/secrets.yml
-echo "  secret_key_base: '$SECRET_B'" >> config/secrets.yml
-echo "production:" >> config/secrets.yml
-echo "  secret_key_base: '$SECRET_C'" >> config/secrets.yml
- 
-
-
 echo "Installing required gems"
 gem install bundler
 bundle install
@@ -153,6 +134,17 @@
 
 rake assets:precompile
 
+echo "setup the secret file"
+SECRET_A=`rake secret`
+SECRET_B=`rake secret`
+SECRET_C=`rake secret`
+echo "development:" > config/secrets.yml
+echo "  secret_key_base: '$SECRET_A'" >> config/secrets.yml
+echo "test:" >> config/secrets.yml
+echo "  secret_key_base: '$SECRET_B'" >> config/secrets.yml
+echo "production:" >> config/secrets.yml
+echo "  secret_key_base: '$SECRET_C'" >> config/secrets.yml
+
 echo "Intalling web interface complete..."
 echo
 echo "Fetching grader"