X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvserver-build;h=a4a4455e276d1272b246c2b309a46cc3c16fe7ce;hb=8df6314090cda53869d92a1526081fa01fe2080b;hp=463294f94d382880ee5fae44d0923b4d08f70493;hpb=48f4af6134e3f6bc110db01a04f8f43466034577;p=util-vserver.git diff --git a/util-vserver/scripts/vserver-build b/util-vserver/scripts/vserver-build index 463294f..a4a4455 100755 --- a/util-vserver/scripts/vserver-build +++ b/util-vserver/scripts/vserver-build @@ -18,7 +18,7 @@ : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." + echo "Can not find util-vserver installation; aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -80,7 +80,7 @@ the GNU General Public License. This program has absolutely no warranty." set -e declare -a default_opts=() -test "$NO_DEFAULT_OPTS" || getFileArray default_opts "$CONFDIR/.defaults/apps/build/options" +test "$NO_DEFAULT_OPTS" || getFileArray default_opts "$CONFDIR/.defaults/apps/build/options" || : tmp=$(getopt -o +m:n: --long force,debug,help,version,rootdir:,pkgbase:,$SETUP_OPTIONS -n "$(basename $0)" -- \ "${default_opts[@]}" "$@") || exit 1 @@ -91,18 +91,18 @@ OPTION_FORCE= while true; do case "$1" in - --help) showHelp $0 ;; - --version) showVersion ;; - --force) OPTION_FORCE=1;; - --debug) set -x;; - --rootdir) ROOTDIR=$2; shift;; - --pkgbase) PKGCFGBASE=$2; shift;; - -m) method=$2; shift;; - -n) VSERVER_NAME=$2; shift;; - --) shift; break;; - *) + (--help) showHelp $0 ;; + (--version) showVersion ;; + (--force) OPTION_FORCE=1;; + (--debug) set -x;; + (--rootdir) ROOTDIR=$2; shift;; + (--pkgbase) PKGCFGBASE=$2; shift;; + (-m) method=$2; shift;; + (-n) VSERVER_NAME=$2; shift;; + (--) shift; break;; + (*) { setup_setOption2 "$1" "$2" && shift; } || \ - { echo $"vserver-build: internal error."; exit 1; } + { echo $"vserver-build: internal error."; exit 1; } >&2 ;; esac shift @@ -111,19 +111,19 @@ done test "$VSERVER_NAME" || { echo $"Name of vserver not specified" exit 1 -} +} >&2 setup_setDefaults "$VSERVER_NAME" case x"$method" in - xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; - xapt-rpm|xcopy|xskeleton|xdebootstrap) + (xlegacy) exec $_VSERVER_LEGACY "$VSERVER_NAME" build "$@" ;; + (xapt-rpm|xcopy|xskeleton|xdebootstrap) . $PKGLIBDIR/vserver-build.$method ;; - x) echo $"No build-method specified" >&2 + (x) echo $"No build-method specified" >&2 exit 1 ;; - *) echo $"Unknown build-method '$method'" >&2 + (*) echo $"Unknown build-method '$method'" >&2 exit 1 ;; esac