From 4d26a300f51d698c3558a89f7919caa92955321c Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Fri, 25 May 2012 13:32:55 +0200
Subject: Adjusted Ruby + Java Package hint

---
 base-install.sh | 18 ++----------------
 config.sh       |  3 ++-
 ruby.sh         |  2 ++
 3 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/base-install.sh b/base-install.sh
index aed094c..66bb539 100644
--- a/base-install.sh
+++ b/base-install.sh
@@ -36,18 +36,7 @@ echo
 echo "Updating index"
 sudo $APTITUDE update -y >/dev/null 2>&1
 
-echo
-echo "Checking installation:"
-pack_arr=""
-for p in $packs; do
-  if [ "un" != `$DPKG -l "$p" 2>/dev/null | tail -1 | awk -F " " '{print $1}'` ]; then
-     printf "%50s%30s\n" "'$p'" "Y"
-  else
-     printf "%50s%30s\n" "'$p'" "N"
-    pack_arr="$pack_arr $p"
-  fi
-done
-
+pack_arr=$packs
 if [ -n "$pack_arr" ]; then
   echo 
   echo "Checking availablity:"
@@ -70,12 +59,9 @@ fi
 
 echo
 if [ -n "$pack_arr" ]; then 
-  echo "Installing missing packages:"
+  cmd="sudo $APTITUDE -y install $pack_arr" && run_cmd "$cmd" "Installing packages"
 fi
 
-for p in $pack_arr; do
-  cmd="sudo $APTITUDE -y install $p" && run_cmd "$cmd" "$p"
-done
 
 if [ ! -f $JAVA_CONF ]; then
 
diff --git a/config.sh b/config.sh
index 8ece62e..b8228c9 100755
--- a/config.sh
+++ b/config.sh
@@ -12,9 +12,10 @@ OT_BRANCH="development"     # Maturity              (development -you need SSH k
 # 2) Where all binaries are installed.
 OT_PREFIX="$HOME/opentox-ruby"
 OT_JAVA_HOME="/usr/lib/jvm/java-6-openjdk"
+# USE THIS FOR 64BIT: OT_JAVA_HOME="/usr/lib/jvm/java-6-openjdk-amd64"
 
 # 3) What versions to install.
-RUBY_NUM_VER="1.8.7-2011.03"
+RUBY_NUM_VER="1.8.7-2012.02"
 OB_NUM_VER="2.2.3"
 KL_NUM_VER="0.9-11"
 REDIS_NUM_VER="2.4.4"
diff --git a/ruby.sh b/ruby.sh
index 2e53384..8f96604 100755
--- a/ruby.sh
+++ b/ruby.sh
@@ -44,6 +44,8 @@ if [ ! $RUBY_DONE ]; then
     cmd="$WGET $URI" && run_cmd "$cmd" "Download"
     cmd="tar xzf $RUBY_VER.tar.gz" && run_cmd "$cmd" "Unpack"
   fi
+  # Fix Bug
+  sed -i '1672s/__memalign/\ volatile\ __memalign/g' $HOME/tmp/$RUBY_VER/source/distro/google-perftools-1.7/src/tcmalloc.cc
   cmd="sh $HOME/tmp/$RUBY_VER/installer  --dont-install-useful-gems --no-dev-docs --auto=$RUBY_DEST" && run_cmd "$cmd" "Install"
 fi
 
-- 
cgit v1.2.3