aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xtrunk/src/metapkg9
-rwxr-xr-xtrunk/src/mkjail2
2 files changed, 6 insertions, 5 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
diff --git a/trunk/src/mkjail b/trunk/src/mkjail
index a79bfe6..14b50c9 100755
--- a/trunk/src/mkjail
+++ b/trunk/src/mkjail
@@ -140,8 +140,8 @@ echo "$BASENAME: instaling packages into $JAIL_ROOT/$server using $TEMPLATE..."
install_packages
copy_template_files $JAIL_ROOT/$server
set_jail_perms $JAIL_ROOT/$server
-exec_post_install_scripts $JAIL_ROOT $server
jailist_update $JAIL_ROOT/$server
+exec_post_install_scripts $JAIL_ROOT $server
echo $BASENAME: done creating $server jail