diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-03-23 09:38:51 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-03-23 09:38:51 +0100 |
commit | 910de948361087435d00738982699953a5ee5ca5 (patch) | |
tree | 497ce6190a174041eded51fd7be3e8006a27299c | |
parent | ae9d6c6a06360007668e51a9be19a8b66374000d (diff) | |
parent | 6568fb04b16e12e29fba0b8ec3287d024d5fc37a (diff) |
Merge branch 'modular' of github.com:opentox/install into modular
-rwxr-xr-x | base-install.sh | 33 | ||||
-rwxr-xr-x | install | 2 |
2 files changed, 19 insertions, 16 deletions
diff --git a/base-install.sh b/base-install.sh index be8097d..aaf1113 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." @@ -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." |