aboutsummaryrefslogtreecommitdiff
path: root/trunk/src/metapkg
diff options
context:
space:
mode:
authorrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-02-11 19:55:23 +0000
committerrhatto <rhatto@04377dda-e619-0410-9926-eae83683ac58>2007-02-11 19:55:23 +0000
commitf5ddefdbd8118f70eb457566de06c16daf5834fd (patch)
tree793cdeb5e3a971824ad222cefbe51ed702d8e69b /trunk/src/metapkg
parent6fa49c9dd9c53c0e930a49e91548002f1098bd29 (diff)
downloadsimplepkg-f5ddefdbd8118f70eb457566de06c16daf5834fd.tar.gz
simplepkg-f5ddefdbd8118f70eb457566de06c16daf5834fd.tar.bz2
mkjail: change script order: jailist update now happens before post-install scripts
git-svn-id: svn+slack://slack.fluxo.info/var/svn/simplepkg@184 04377dda-e619-0410-9926-eae83683ac58
Diffstat (limited to 'trunk/src/metapkg')
-rwxr-xr-xtrunk/src/metapkg9
1 files changed, 5 insertions, 4 deletions
diff --git a/trunk/src/metapkg b/trunk/src/metapkg
index e83ee4d..d86807e 100755
--- a/trunk/src/metapkg
+++ b/trunk/src/metapkg
@@ -22,10 +22,11 @@
#
COMMON="/usr/libexec/simplepkg/common.sh"
+BASENAME="`basename $0`"
ROOT="/"
function usage {
- echo "usage: [ROOT=/otherroot] `basename $0` --option [metapackage]"
+ echo "usage: [ROOT=/otherroot] $BASENAME --option [metapackage]"
echo "options: --install, --remove"
exit 1
}
@@ -40,7 +41,7 @@ fi
if [ -z "$2" ]; then
usage
else
- eval_config `basename $0` -u
+ eval_config $BASENAME -u
fi
if [ ! -f "$BASE_CONF/$2.template" ]; then
@@ -51,9 +52,9 @@ else
unset server
fi
-if [[ "$1" == "--install" ]]; then
+if [ "$1" == "--install" ] || [ "$1" == "install" ]; then
install_packages
-elif [[ "$1" == "--remove" ]]; then
+elif [ "$1" == "--remove" ] || [ "$1" == "remove" ]; then
remove_packages
else
usage