X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvemerge;h=36321ab99a2f72f96d09cc52bf2c6885387dbe89;hb=2198bce8b4e20700ca72473140980208d0937e9d;hp=1da3e92e7e8679ee3caba103553e24b66d97703d;hpb=004894c3589aba3533f4c53b1650d9cc2c19ac69;p=util-vserver.git diff --git a/scripts/vemerge b/scripts/vemerge index 1da3e92..36321ab 100755 --- a/scripts/vemerge +++ b/scripts/vemerge @@ -46,7 +46,7 @@ the GNU General Public License. This program has absolutely no warranty." exit 0 } -tmp=$(getopt -o +q --long help,version,debug,quiet,all -n "$0" -- "$@") || exit 1 +tmp=$(getopt -o +q --long help,version,debug,quiet,$VS_ALLVSERVERS_ARGS -n "$0" -- "$@") || exit 1 eval set -- "$tmp" declare -a send_through vsomething_opts @@ -57,9 +57,8 @@ while true; do (--version) showVersion ;; (--debug) send_through=( "${send_through[@]}" "$1" ); set -x;; (--quiet|-q) send_through=( "${send_through[@]}" "$1" );; - (--all) vsomething_opts=( "${vsomething_opts[@]}" "$1" );; (--) test ${#vsomething_opts[@]} -eq 0 && shift; break;; - (*) echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;; + (*) vsomething_opts=( "${vsomething_opts[@]}" "$1" );; esac shift done