all

1 files changed, 21 insertions, 17 deletions

diff --git a/openbabel.sh b/openbabel.sh
index 58b47b4..a28796d 100755
--- a/openbabel.sh
+++ b/openbabel.sh
@@ -42,8 +42,10 @@ fi
 if [ ! $OB_DONE ]; then
   cd /tmp
   URI="http://downloads.sourceforge.net/project/openbabel/openbabel/$OB_NUM_VER/$OB_VER.tar.gz?use_mirror=kent"
-  cmd="$WGET $URI" && run_cmd "$cmd" "Download"
-  cmd="tar zxf $OB_VER.tar.gz?use_mirror=kent $OB_VER"  && run_cmd "$cmd" "Unpack"
+  if ! [ -d "/tmp/$OB_VER" ]; then 
+    cmd="$WGET $URI" && run_cmd "$cmd" "Download"
+    cmd="tar zxf $OB_VER.tar.gz?use_mirror=kent $OB_VER"  && run_cmd "$cmd" "Unpack"
+  fi
   cd "/tmp/$OB_VER"
 
   cmd="./configure --prefix=$OB_DEST" && run_cmd "$cmd" "Configure"
@@ -51,9 +53,25 @@ if [ ! $OB_DONE ]; then
   cmd="make install" && run_cmd "$cmd" "Install"
 fi
 
+if [ ! -f "$OB_CONF" ]; then
+
+  echo "if ! [[ \"\$PATH\" =~ \"$OB_DEST\" ]]; then export PATH=\"$OB_DEST/bin:\$PATH\"; fi" >> "$OB_CONF"
+  echo "if ! [[ \"\$LD_LIBRARY_PATH\" =~ \"$OB_DEST\" ]]; then export LD_LIBRARY_PATH=\"$OB_DEST/lib:\$LD_LIBRARY_PATH\"; fi" >> "$OB_CONF"
+  echo "if [ -z \"\$BABEL_LIBDIR\" ]; then export BABEL_LIBDIR=\"$OB_DEST/lib/openbabel/2.3.0\"; fi" >> "$OB_CONF"
+  echo "if [ -z \"\$BABEL_DATADIR\" ]; then export BABEL_DATADIR=\"$OB_DEST/share/openbabel/2.3.0\"; fi" >> "$OB_CONF"
+  echo "if [ -z \"\$RUBYLIB\" ]; then export RUBYLIB=\"$OB_DEST_BINDINGS\"; fi" >> "$RUBY_CONF"
+
+  echo "Openbabel configuration has been stored in '$OB_CONF'."
+  if ! grep "$OB_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
+    echo "source \"$OB_CONF\"" >> $HOME/.bashrc
+  fi
+
+fi
+
 echo
 echo "Bindings:"
 OB_DONE=false
+source "$HOME/.bashrc"
 mkdir "$OB_DEST_BINDINGS">/dev/null 2>&1
 if [ ! -d "$OB_DEST_BINDINGS" ]; then
   echo "Install directory '$OB_DEST_BINDINGS' is not available! Aborting..."
@@ -67,25 +85,11 @@ fi
 
 if ! $OB_DONE ; then
   cd "/tmp/$OB_VER/scripts/ruby/"
-  cmd="ruby extconf.rb --with-openbabel-include=$OB_DEST/include/openbabel-2.0" && run_cmd "$cmd" "Code"
+  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"
 fi
 
 cd "$DIR"
 
-if [ ! -f $OB_CONF ]; then
-
-  echo "if ! [[ \"\$PATH\" =~ \"$OB_DEST\" ]]; then export PATH=\"$OB_DEST/bin:\$PATH\"; fi" >> "$OB_CONF"
-  echo "if ! [[ \"\$LD_LIBRARY_PATH\" =~ \"$OB_DEST\" ]]; then export LD_LIBRARY_PATH=\"$OB_DEST/lib:\$LD_LIBRARY_PATH\"; fi" >> "$OB_CONF"
-  echo "if [ -z \"\$BABEL_LIBDIR\" ]; then export BABEL_LIBDIR=\"$OB_DEST/lib/openbabel/2.3.0\"; fi" >> "$OB_CONF"
-  echo "if [ -z \"\$BABEL_DATADIR\" ]; then export BABEL_DATADIR=\"$OB_DEST/share/openbabel/2.3.0\"; fi" >> "$OB_CONF"
-  echo "if [ -z \"\$RUBYLIB\" ]; then export RUBYLIB=\"$OB_DEST_BINDINGS\"; fi" >> "$RUBY_CONF"
-
-  echo "Openbabel configuration has been stored in '$OB_CONF'."
-  if ! grep "$OB_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
-    echo "source \"$OB_CONF\"" >> $HOME/.bashrc
-  fi
-
-fi