From bdf7dba42ea7256456653c06cf6cae4ec76105de Mon Sep 17 00:00:00 2001
From: Florian Staudacher <florian.staudacher@gmx.at>
Date: Wed, 16 May 2012 16:11:04 +0200
Subject: [PATCH] update ruby version, be more verbose while installing, load
 .rvmrc the hard way

---
 script/install.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/script/install.sh b/script/install.sh
index 3ba511261..49386bcb6 100755
--- 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