Ruby installed globally

3 files changed, 24 insertions, 8 deletions

diff --git a/base-install b/base-install
index 3e3454a..c7d717e 100755
--- a/base-install
+++ b/base-install
@@ -13,7 +13,7 @@ DIR=`pwd`
 # Not logged
 # Not logged
 [ "`id -u`" = "0" ] && echo "This script must not be run as root" 1>&2 && exit 1
-check_utils "aptitude apt-get git apt-cache dpkg"
+check_utils "aptitude apt-get apt-cache dpkg"
 
 echo
 echo "Base Packages:"
diff --git a/install b/install
index fd94cd1..b336315 100755
--- a/install
+++ b/install
@@ -26,7 +26,6 @@ echo "Backup finished."
 
 . ./utils.sh
 
-LOG="$OT_PREFIX/tmp/`basename $0`.log"
 echo
 echo "Welcome to base installation for OpenTox compatible services on Ruby and Debian."
 echo "IMPORTANT: Hit <Ctrl+C> to adjust config.sh first (<Return> to continue)."
@@ -46,6 +45,7 @@ echo
 ./rasqal-install # Download, compile and build rasqal. Install to OT_PREFIX.
 ./4store-install # Download, compile and build 4store. Install to OT_PREFIX.
 
+check_utils "git"
 if [ ! -d ~/.rbenv ]; then
   cmd="$GIT clone git://github.com/sstephenson/rbenv.git ~/.rbenv" && run_cmd "$cmd" "rbenv"
 else
@@ -56,8 +56,17 @@ if ! grep "rbenv" $OT_UI_CONF >/dev/null 2>&1 ; then
   echo 'if ! echo "$PATH" | grep "$HOME/.rbenv/bin">/dev/null 2>&1; then export PATH="$HOME/.rbenv/bin:$PATH"; eval "$(rbenv init -)"; fi' >> $OT_UI_CONF
 fi
 
-[ -f $HOME/.opentox/config/ambit_descriptors.yaml ] || (cmd="cp ambit_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Ambit keys file")
-[ -f $HOME/.opentox/config/jl_keys.yaml ] || (cmd="cp jl_keys.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Joelib keys file")
-[ -f $OT_TOOLS_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONF" && run_cmd "$cmd" "Install ot-tools.sh to CONFIG (~/.opentox/config)")
+#[ -f $HOME/.opentox/config/ambit_descriptors.yaml ] || (cmd="cp ambit_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Ambit keys file")
+#[ -f $HOME/.opentox/config/jl_keys.yaml ] || (cmd="cp jl_keys.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Joelib keys file")
+#[ -f $OT_TOOLS_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONF" && run_cmd "$cmd" "Install ot-tools.sh to CONFIG (~/.opentox/config)")
+
+
+# Install global ruby version
+. $OT_UI_CONF
+check_utils "rbenv"
+SELF=$(basename $0)
+check_log $SELF
+export RUBY_NUM_VER="1.9.3-p194"
+[ "`$RBENV global 2>/dev/null`" = "$RUBY_NUM_VER" ] || (install_ruby global)
 
 notify
diff --git a/utils.sh b/utils.sh
index 87013d9..caa96ef 100755
--- a/utils.sh
+++ b/utils.sh
@@ -61,7 +61,8 @@ run_cmd ()
 # }
 check_utils() {
   for u in $1; do
-    eval `echo $u | tr "[:lower:]" "[:upper:]" | tr "-" "_"`=`which $u` || (echo "'$u' missing. Install '$u' first." 1>&2 && exit 1)
+    (uPath=`which $u`) || (echo "'$u' missing. Install '$u' first." 1>&2 && exit 1)
+    eval `echo $u | tr "[:lower:]" "[:upper:]" | tr "-" "_"`="$uPath"
   done
 }
 
@@ -69,7 +70,7 @@ check_utils() {
 # install ruby using rbenv
 # configure the version in config.sh
 install_ruby() {
-  printf "\n%50s\n" "RUBY"
+  printf "\n%50s\n" "RUBY (v. '$RUBY_NUM_VER')"
   local DIR=`pwd`
   check_utils "rbenv curl make tar"
   if ! $RBENV versions $RUBY_NUM_VER | grep $RUBY_NUM_VER>/dev/null 2>&1; then
@@ -81,7 +82,13 @@ install_ruby() {
   fi
   cd $DIR
   cmd="$RBENV rehash" && run_cmd "$cmd" "Rbenv rehash"
-  cmd="$RBENV local $RUBY_NUM_VER" && run_cmd "$cmd" "Rbenv set ruby"
+  if [ "$1" = "global" ]; then
+    cmd="$RBENV global $RUBY_NUM_VER" && run_cmd "$cmd" "Rbenv set ruby global"
+  else
+    if ! $RBENV global | grep $RUBY_NUM_VER>/dev/null 2>&1; then
+      cmd="$RBENV local $RUBY_NUM_VER" && run_cmd "$cmd" "Rbenv set ruby local"
+    fi
+  fi
 }
 
 # install a ruby gem using bundler