Guarding dirs, Linking OB LIB to site_ruby

5 files changed, 12 insertions, 2 deletions

diff --git a/base-install.sh b/base-install.sh
index 5e00708..2a4afb5 100644
--- a/base-install.sh
+++ b/base-install.sh
@@ -84,6 +84,7 @@ if [ ! -f $JAVA_CONF ]; then
 
   echo "if echo \"\$JAVA_HOME\" | grep -v \"$OT_JAVA_HOME\">/dev/null 2>&1; then export JAVA_HOME=\"$OT_JAVA_HOME\"; fi" >> "$JAVA_CONF"
   echo "if echo \"\$PATH\" | grep -v \"$OT_JAVA_HOME\">/dev/null 2>&1; then export PATH=\"$OT_JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF"
+  echo "if ! [ -d \"\$JAVA_HOME\" ]; then echo \"\$0: '\$OT_JAVA_HOME' is not a directory!\"; fi" >> "$JAVA_CONF"
 
   echo "Java configuration has been stored in '$JAVA_CONF'."
   if ! grep "$JAVA_CONF" $OT_UI_CONF >/dev/null 2>&1; then
diff --git a/config.sh b/config.sh
index 428c621..7fe4006 100755
--- a/config.sh
+++ b/config.sh
@@ -10,7 +10,7 @@ OT_INSTALL="local"     # Type                  (gem, local, server)
 OT_BRANCH="master"     # Maturity              (development, master)
 
 # 2) Where all binaries are installed.
-OT_PREFIX="$HOME/opentox"
+OT_PREFIX="$HOME/opentox-ruby"
 OT_JAVA_HOME="/usr/lib/jvm/java-6-sun"
 
 # 3) What versions to install.
diff --git a/kernlab.sh b/kernlab.sh
index a49635f..2fba2a8 100644
--- a/kernlab.sh
+++ b/kernlab.sh
@@ -58,6 +58,7 @@ fi
 if [ ! -f $KL_CONF ]; then
 
   echo "if echo \"\$R_LIBS\" | grep -v \"$KL_DEST\">/dev/null 2>&1; then export R_LIBS=\"$KL_DEST\"; fi" >> "$KL_CONF"
+  echo "if ! [ -d \"$KL_DEST\" ]; then echo \"\$0: '$KL_DEST' is not a directory!\"; fi" >> "$KL_CONF"
   echo "R package destination has been stored in '$KL_CONF'."
 
   if ! grep "$KL_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
diff --git a/nginx.sh b/nginx.sh
index e7ba87f..36a84df 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -51,7 +51,7 @@ passenger=`ls -d passenger*`
 cd - >>$LOG 2>&1
 servername=`hostname`
 $GIT checkout nginx.conf>>$LOG 2>&1
-cmd="sed -i -e \"s,PASSENGER,$passenger,;s,SERVERNAME,$servername,;s,RUBY_DEST,$RUBY_DEST,;s,NGINX_DEST,$NGINX_DEST;s,WWW_DEST,$WWW_DEST,\" ./nginx.conf" && run_cmd "$cmd" "Config"
+cmd="sed -i -e \"s,PASSENGER,$passenger,;s,SERVERNAME,$servername,;s,RUBY_DEST,$RUBY_DEST,;s,NGINX_DEST,$NGINX_DEST,;s,WWW_DEST,$WWW_DEST,\" ./nginx.conf" && run_cmd "$cmd" "Config"
 cmd="cp ./nginx.conf \"$NGINX_DEST/conf\"" && run_cmd "$cmd" "Copy"
 
 cd "$DIR"
diff --git a/openbabel.sh b/openbabel.sh
index d4c635f..6cd4889 100755
--- a/openbabel.sh
+++ b/openbabel.sh
@@ -55,9 +55,16 @@ if [ ! -f "$OB_CONF" ]; then
 
   echo "if echo \"\$PATH\" | grep -v \"$OB_DEST\">/dev/null 2>&1; then export PATH=\"$OB_DEST/bin:\$PATH\"; fi" >> "$OB_CONF"
   echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$OB_DEST\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$OB_DEST/lib:\$LD_LIBRARY_PATH\"; fi" >> "$OB_CONF"
+  echo "if ! [ -d \"$OB_DEST\" ]; then echo \"\$0: '$OB_DEST' is not a directory!\"; fi" >> "$OB_CONF"
+
   echo "if [ -z \"\$BABEL_LIBDIR\" ]; then export BABEL_LIBDIR=\"$OB_DEST/lib/openbabel/$OB_NUM_VER\"; fi" >> "$OB_CONF"
+  echo "if ! [ -d \"\$BABEL_LIBDIR\" ]; then echo \"\$0: '\$BABEL_LIBDIR' is not a directory!\"; fi" >> "$OB_CONF"
+
   echo "if [ -z \"\$BABEL_DATADIR\" ]; then export BABEL_DATADIR=\"$OB_DEST/share/openbabel/$OB_NUM_VER\"; fi" >> "$OB_CONF"
+  echo "if ! [ -d \"\$BABEL_DATADIR\" ]; then echo \"\$0: '\$BABEL_DATADIR' is not a directory!\"; fi" >> "$OB_CONF"
+
   echo "if echo \"\$RUBYLIB\" | grep -v \"$OB_DEST_BINDINGS\">/dev/null 2>&1; then export RUBYLIB=\"$OB_DEST_BINDINGS:\$RUBYLIB\"; fi" >> "$RUBY_CONF"
+  echo "if ! [ -d \"$OB_DEST_BINDINGS\" ]; then echo \"\$0: '$OB_DEST_BINDINGS' is not a directory!\"; fi" >> "$RUBY_CONF"
 
   echo "Openbabel configuration has been stored in '$OB_CONF'."
   if ! grep "$OB_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
@@ -84,6 +91,7 @@ if ! $OB_DONE ; then
   cmd="ruby extconf.rb --with-openbabel-include=$OB_DEST/include/openbabel-2.0 --with-openbabel-lib=$OB_DEST/lib" && run_cmd "$cmd" "Code"
   cmd="make" && run_cmd "$cmd" "Make"
   cmd="cp openbabel.so $OB_DEST_BINDINGS" && run_cmd "$cmd" "Install"
+  cmd="ln -s $OB_DEST_BINDINGS/openbabel.so $RUBY_DEST/lib/ruby/site_ruby/1.8/i686-linux/" && run_cmd "$cmd" "Link"
 fi
 
 cd "$DIR"