X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvupdateworld;h=ebc5edf02b981e0254a1e7a336b75781942d07e1;hb=65600eead296f8d5f1c04f2cecb565baec7ac169;hp=0ce3e5a5f2d3090d11128faeed8acd3730df82bf;hpb=f848833a2cdd09d5e4e5d94b5ddf67cf271dd980;p=util-vserver.git diff --git a/scripts/vupdateworld b/scripts/vupdateworld index 0ce3e5a..ebc5edf 100755 --- a/scripts/vupdateworld +++ b/scripts/vupdateworld @@ -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" );; - (--) shift; break;; - (*) echo $"vemerge: internal error; arg=='$1'" >&2; exit 1;; + (--) test ${#vsomething_opts[@]} -eq 0 && shift; break;; + (*) vsomething_opts=( "${vsomething_opts[@]}" "$1" );; esac shift done @@ -74,10 +73,8 @@ while [ $# -gt 0 ]; do shift done -VSOMETHING_TITLE=vemerge +VSOMETHING_TITLE=vupdateworld VSOMETHING_PKGMGMT=1 export VSOMETHING_TITLE VSOMETHING_PKGMGMT - -test ${#vsomething_opts[@]} -eq 0 || vsomething_opts=( "${vsomething_opts[@]}" -- ) exec $_VSOMETHING "${send_through[@]}" emerge "${vsomething_opts[@]}" "${vserver_names[@]}" -- world --update --deep --newuse "$@"