minor optimizations
[util-vserver.git] / util-vserver / scripts / vserver-build.apt-rpm
index 230c801..a377dfe 100644 (file)
@@ -24,10 +24,10 @@ eval set -- "$tmp"
 
 while true; do
     case "$1" in
-       -d)             DISTRIBUTION=$2; shift;;
-       --debug)        set -x;;
-       --)             shift; break ;;
-       *)              echo "vserver-build.apt-rpm: internal error: unrecognized option '$1'" >&2
+       (-d)            DISTRIBUTION=$2; shift;;
+       (--debug)       set -x;;
+       (--)            shift; break ;;
+       (*)             echo "vserver-build.apt-rpm: internal error: unrecognized option '$1'" >&2
                        exit 1
                        ;;
     esac
@@ -50,9 +50,10 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
-rpm.initDB           "$VSERVER_NAME"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- update
+rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
+rpm.initDB           "$SETUP_CONFDIR"
+$_VAPT_GET "$SETUP_CONFDIR" -- update
 apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR"
-"$_VAPT_GET" "$SETUP_CONFDIR" -- dist-upgrade -y
+$_VAPT_GET "$SETUP_CONFDIR" -- dist-upgrade -y
+$_VAPT_GET "$SETUP_CONFDIR" -- clean
 test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"