# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# License: This file is licensed under the GPL v2.
-# Latest change: Mon Apr 16 12:21:19 CEST 2007 [mika]
+# Latest change: Mon Apr 16 13:12:14 CEST 2007 [mika]
################################################################################
set -e # exit on any error
# use aptitude only if it's available
if [ -x /usr/bin/aptitude ] ; then
- APTINSTALL='aptitude -y'
+ APTINSTALL='aptitude -y install '
APTUPDATE='aptitude update'
else
- APTINSTALL='apt-get --force-yes -y'
+ APTINSTALL='apt-get --force-yes -y install'
APTUPDATE='apt-get update'
fi
# helper functions {{{
stage() {
- if grep -q done "$STAGES/$1" 2>/dev/null ; then
- echo " * Notice: stage $1 has been executed already, skipping execution therefore."
- return 1
- else
+ if [ -n "$2" ] ; then
echo "$2" > "$STAGES/$1"
return 0
+ elif grep -q done "$STAGES/$1" 2>/dev/null ; then
+ ewarn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
+ return 1
fi
}
# }}}