Shortened commands

2 files changed, 15 insertions, 47 deletions

diff --git a/base-install.sh b/base-install.sh
index 35b0515..105c0ad 100755
--- a/base-install.sh
+++ b/base-install.sh
@@ -15,20 +15,10 @@ if [ "$(id -u)" = "0" ]; then
 fi
 
 # Utils
-APTITUDE=`which aptitude`
-GIT=`which git`
-APT_CACHE=`which apt-cache`
-DPKG=`which dpkg`
-
-if [ ! -e $APTITUDE ]; then
-  echo "Aptitude missing. Install aptitude first." 1>&2
-  exit 1
-fi
-
-if [ ! -e $GIT ]; then
-  echo "Git missing. Install git first." 1>&2
-  exit 1
-fi
+utils="aptitude git apt-cache dpkg"
+for u in $utils; do
+  eval `echo $u | tr "[:lower:]" "[:upper:]" | tr "-" "_"`=`which $u` || (echo "'$u' missing. Install '$u' first." 1>&2 && exit 1)
+done
 
 # Init main file
 touch "$OT_UI_CONF"
diff --git a/openbabel.sh b/openbabel.sh
index 11656c9..552851c 100755
--- a/openbabel.sh
+++ b/openbabel.sh
@@ -1,37 +1,25 @@
 #!/bin/sh
-#
+
 # Installs Openbabel.
-# A configuration file is created and included in your '$OT_UI_CONF'.
 # Author: Christoph Helma, Andreas Maunz.
-#
+# A configuration file is created and included in your 'OT_UI_CONF' (see config.sh).
 
 . "`pwd`/utils.sh"
 DIR="`pwd`"
+OB_DWL="http://downloads.sourceforge.net/sourceforge/openbabel/$OB_NUM_VER/$OB_VER.tar.gz"
 
-if [ "$(id -u)" = "0" ]; then
-  echo "This script must be run as non-root." 1>&2
-  exit 1
-fi
+[ "`id -u`" = "0" ] && echo "This script must be run as non-root." 1>&2 && exit 1
 
-# Utils
-WGET="`which wget`"
-if [ ! -e "$WGET" ]; then
-  echo "'wget' missing. Install 'wget' first. Aborting..."
-  exit 1
-fi
-CMAKE="`which cmake`"
-if [ ! -e "$CMAKE" ]; then
-  echo "'cmake' missing. Install 'cmake' first. Aborting..."
-  exit 1
-fi
+# check utils
+utils="curl cmake"
+for u in $utils; do
+  eval `echo $u | tr "[:lower:]" "[:upper:]"`=`which $u` || (echo "'$u' missing. Install '$u' first." 1>&2 && exit 1)
+done
 
-# Pkg
+# check openbabel
 LOG="$OT_PREFIX/tmp/`basename $0`-log.txt"
-
 echo
 echo "Openbabel ('$OB_DEST', '$LOG'):"
-
-
 mkdir "$OB_DEST" >/dev/null 2>&1
 if [ ! -d "$OB_DEST" ]; then
   echo "Install directory '$OB_DEST' is not available! Aborting..."
@@ -44,34 +32,24 @@ fi
 
 if [ ! $OB_DONE ]; then
   cd "$OT_PREFIX/tmp">>$LOG 2>/dev/null
-  URI="http://downloads.sourceforge.net/project/openbabel/openbabel/$OB_NUM_VER/$OB_VER.tar.gz?use_mirror=kent"
-  if ! [ -d "$OT_PREFIX/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 "$OT_PREFIX/tmp/$OB_VER">>$LOG 2>/dev/null
+  ([ -d "$OT_PREFIX/tmp/$OB_VER" ] || $CURL -L -d use_mirror=netcologne $OB_DWL 2>/dev/null | tar zx) && cd $OB_VER
   cmd="$CMAKE -DCMAKE_INSTALL_PREFIX=$OB_DEST" && run_cmd "$cmd" "Configure"
   cmd="make -j2" && run_cmd "$cmd" "Make"
   cmd="make install" && run_cmd "$cmd" "Install"
 fi
 
 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 "Openbabel configuration has been stored in '$OB_CONF'."
   if ! grep "$OB_CONF" $OT_UI_CONF >/dev/null 2>&1 ; then
     echo ". \"$OB_CONF\"" >> $OT_UI_CONF
   fi
-
 fi
 
 cd "$DIR"