summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Maunz <andreas@maunz.de>2012-03-23 08:47:03 +0100
committerAndreas Maunz <andreas@maunz.de>2012-03-23 08:47:03 +0100
commit8671a4e01a1447a6a8eeb0cc50ff2fa0346f9fe2 (patch)
treeafc83b5b7d4e21ab9651951247f372d64d6aed6c
parent65b517dd4494d730bf5602bd070a59d0044efe5b (diff)
parente21e1db750e78acf3da17839b7781990cfbea916 (diff)
Merge branch 'release/v3.1.0'
-rw-r--r--base-install.sh28
1 files changed, 15 insertions, 13 deletions
diff --git a/base-install.sh b/base-install.sh
index 73c9e37..aed094c 100644
--- a/base-install.sh
+++ b/base-install.sh
@@ -32,9 +32,15 @@ packs="binutils build-essential git-core gnuplot hostname libcurl4-openssl-dev l
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
+ if [ "un" != `$DPKG -l "$p" 2>/dev/null | tail -1 | awk -F " " '{print $1}'` ]; then
printf "%50s%30s\n" "'$p'" "Y"
else
printf "%50s%30s\n" "'$p'" "N"
@@ -45,19 +51,16 @@ 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 "%50s%30s\n" "'$p'" "Y"
+ else
+ printf "%50s%30s\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."
@@ -65,7 +68,6 @@ if [ -n "$pack_fail" ]; then
sleep 5
fi
-echo sun-java6-jdk shared/accepted-sun-dlj-v1-1 select true | sudo /usr/bin/debconf-set-selections
echo
if [ -n "$pack_arr" ]; then
echo "Installing missing packages:"