From 6568fb04b16e12e29fba0b8ec3287d024d5fc37a Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Fri, 23 Mar 2012 08:42:28 +0100
Subject: Fixed dpkg selection

---
 base-install.sh | 33 ++++++++++++++++++---------------
 install         |  2 +-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/base-install.sh b/base-install.sh
index e9e0860..e8bf173 100755
--- a/base-install.sh
+++ b/base-install.sh
@@ -38,32 +38,35 @@ packs="binutils build-essential cmake gnuplot hostname libcurl4-openssl-dev libg
 echo
 echo "Base Packages:"
 
+echo
+echo "Updating index"
+sudo $APTITUDE update -y >/dev/null 2>&1
+
+echo
+echo "Checking installation:"
 pack_arr=""
 for p in $packs; do
-  if $DPKG -S "$p" >/dev/null 2>&1; then
-     printf "%50s%30s\n" "'$p'" "Y"
+  if [ "un" != `$DPKG -l "$p" 2>/dev/null | tail -1 | awk -F " " '{print $1}'` ]; then
+     printf "%30s%50s\n" "'$p'" "Y"
   else
-     printf "%50s%30s\n" "'$p'" "N"
-    pack_arr="$pack_arr $p"
+     printf "%30s%50s\n" "'$p'" "N"
+     pack_arr="$pack_arr $p"
   fi
 done
 
 if [ -n "$pack_arr" ]; then
   echo 
   echo "Checking availablity:"
-  sudo $APTITUDE update -y >/dev/null 2>&1
-#  sudo $APTITUDE upgrade -y >/dev/null 2>&1
+  for p in $pack_arr; do
+    if [ -n "`$APT_CACHE search $p`" ] ; then
+       printf "%30s%50s\n" "'$p'" "Y"
+    else
+      printf "%30s%50s\n" "'$p'" "N"
+      pack_fail="$pack_fail $p"
+    fi
+  done
 fi
 
-for p in $pack_arr; do
-  if [ -n "`$APT_CACHE search $p`" ] ; then
-     printf "%50s%30s\n" "'$p'" "Y"
-  else
-    printf "%50s%30s\n" "'$p'" "N"
-    pack_fail="$pack_fail $p"
-  fi
-done
-
 if [ -n "$pack_fail" ]; then
   echo 
   echo "WARNING: At least one missing package has no suitable installation candidate."
diff --git a/install b/install
index 7b8a4a8..6ad23c3 100755
--- a/install
+++ b/install
@@ -45,7 +45,7 @@ echo "Cleaning up $HOME/tmp files."
 rm -rf $HOME/tmp/openbabel* $HOME/tmp/kernlab* $HOME/tmp/ruby*
 
 . "./base-install.sh"
-. "./openbabel.sh"
+#. "./openbabel.sh"
 
 echo
 echo "Installation finished and system configured."
-- 
cgit v1.2.3