X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=scripts%2Fvupdateworld;h=a69b693b6c15f6929f71d6edeeb46e01615eabb9;hb=b5a9ccca3590327a5af329177550c1bbd10c9ab3;hp=0ce3e5a5f2d3090d11128faeed8acd3730df82bf;hpb=f848833a2cdd09d5e4e5d94b5ddf67cf271dd980;p=util-vserver.git diff --git a/scripts/vupdateworld b/scripts/vupdateworld index 0ce3e5a..a69b693 100755 --- a/scripts/vupdateworld +++ b/scripts/vupdateworld @@ -58,8 +58,8 @@ while true; do (--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;; + (*) echo $"vupdateworld: internal error; arg=='$1'" >&2; exit 1;; esac shift done @@ -74,10 +74,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 "$@"