nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update ruby version, be more verbose while installing, load .rvmrc the hard way

Browse source
This commit is contained in:
Florian Staudacher 2012-05-16 16:11:04 +02:00
parent ebbbf74489
commit bdf7dba42e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
script/install.sh
View file

@ -54,7 +54,7 @@ D_DB_USER="diaspora"
D_DB_PASS="diaspora" D_DB_PASS="diaspora"
D_RUBY_VERSION="1.9.2-p290" D_RUBY_VERSION="1.9.3-p125"
#### INTERNAL VARS #### #### INTERNAL VARS ####
@ -179,7 +179,7 @@ install_or_use_ruby() {
rvm use $D_RUBY_VERSION >/dev/null 2>&1 rvm use $D_RUBY_VERSION >/dev/null 2>&1
if [ $? -ne 0 ] ; then if [ $? -ne 0 ] ; then
echo "not ok" echo "not ok"
rvm install $D_RUBY_VERSION >/dev/null 2>&1 rvm --force install $D_RUBY_VERSION
else else
echo "ok" echo "ok"
fi fi
@ -202,7 +202,8 @@ load_rvmrc() {
# load .rvmrc # load .rvmrc
echo -n "loading .rvmrc ... " echo -n "loading .rvmrc ... "
rvm rvmrc load source .rvmrc
#rvm rvmrc load
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
echo "ok" echo "ok"
else else