update ruby version, be more verbose while installing, load .rvmrc th…

…e hard way
diaspora · May 16, 2012 · bdf7dba · bdf7dba
1 parent ebbbf74
commit bdf7dba
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/script/install.sh b/script/install.sh
@@ -54,7 +54,7 @@ D_DB_USER="diaspora"
 
 D_DB_PASS="diaspora"
 
-D_RUBY_VERSION="1.9.2-p290"
+D_RUBY_VERSION="1.9.3-p125"
 
 ####                        INTERNAL VARS                        ####
 
@@ -179,7 +179,7 @@ install_or_use_ruby() {
   rvm use $D_RUBY_VERSION >/dev/null 2>&1
   if [ $? -ne 0 ] ; then
     echo "not ok"
-    rvm install $D_RUBY_VERSION >/dev/null 2>&1
+    rvm --force install $D_RUBY_VERSION
   else
     echo "ok"
   fi
@@ -202,7 +202,8 @@ load_rvmrc() {
 
   # load .rvmrc
   echo -n "loading .rvmrc ... "
-  rvm rvmrc load
+  source .rvmrc
+  #rvm rvmrc load
   if [ $? -eq 0 ] ; then
     echo "ok"
   else