X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvsomething;h=556786903b853516c02686002284cf233aaa5a90;hb=202b41b95f79d6faddf79b2fc0f642031034da7c;hp=a2d497b5870a3e1231d52c3a9bb8612e7efcc9fb;hpb=39b582d8b6989c85013038f383b4ff291a04db75;p=util-vserver.git diff --git a/util-vserver/scripts/vsomething b/util-vserver/scripts/vsomething index a2d497b..5567869 100755 --- a/util-vserver/scripts/vsomething +++ b/util-vserver/scripts/vsomething @@ -75,15 +75,15 @@ title=${VSOMETHING_TITLE:-$cmd} shift while test "$#" -ge 1; do - case "$1" in - --) shift; break;; - --all) - getAllVservers tmp - vservers=( "${vservers[@]}" "${tmp[@]}" ) - ;; - *) vservers=( "${vservers[@]}" "$1" ) - esac - shift + if getAllVserversByArg tmp "$1"; then + vservers=( "${vservers[@]}" "${tmp[@]}" ) + else + case "$1" in + (--) shift; break;; + (*) vservers=( "${vservers[@]}" "$1" ) + esac + fi + shift done @@ -95,13 +95,13 @@ res=255 for i in "${vservers[@]}"; do cnt=$[ cnt + 1 ] - test "$is_quiet" || { + test -n "$is_quiet" || { colorize bold echo -n "$title: operating on vserver " colorize bold colorize emph echo "$i" xtermTitle "$title: operating on vserver '$i' [$cnt/${#vservers[@]}]" } - if test "$VSOMETHING_PKGMGMT"; then + if test -n "$VSOMETHING_PKGMGMT"; then if pkgmgmt.isInternal "$i"; then $_VSERVER "$i" exec "$cmd" "$@" else @@ -114,12 +114,12 @@ for i in "${vservers[@]}"; do res=$? - test $res -eq 0 -o "$is_quiet" || { + test $res -eq 0 -o -n "$is_quiet" || { colorize error echo -n $"$title failed on vserver '$i' with errorcode $res" echo } - test "$is_quiet" || echo + test -n "$is_quiet" || echo done test "$cnt" -ge 0 || warning $"No vservers specified"