X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvapt-get;h=3cc203cad09e277a5cf96d5c01754802ab58bc5b;hb=dfa40e043f50b3ed0f89cdec01d0655c94c1e12e;hp=13313dd3ec65cc0861d5c144a109aaa257642643;hpb=bbe9a9f735bc09bdd6ac46ec23f82506dc589432;p=util-vserver.git diff --git a/util-vserver/scripts/vapt-get b/util-vserver/scripts/vapt-get index 13313dd..3cc203c 100755 --- a/util-vserver/scripts/vapt-get +++ b/util-vserver/scripts/vapt-get @@ -16,58 +16,83 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -: ${UTIL_VSERVER_VARS:=$(dirname $0)/util-vserver-vars} +: ${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 (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" . "$_LIB_FUNCTIONS" + function showHelp() { - echo "Usage: $0 * [--all] -- +" + echo \ +$"Usage: $0 * [--all] -- + + +Report bugs to <$PACKAGE_BUGREPORT>." exit $1 } function showVersion() { - cat <&2 +test "${#vservers[@]}" -ne 1 || is_quiet=1 cnt=0 res=255 -for i in $vservers; do +for i in "${vservers[@]}"; do cnt=$[ cnt + 1 ] - _APT_GET=apt-get \ - "$_NEW_NAMESPACE" "$_VAPT_GET_WORKER" "$i" "$@" + + test -n "$is_quiet" || { + colorize bold echo -n "vaptget: operating on vserver " + colorize bold colorize emph echo "$i" + xtermTitle "vaptget: operating on vserver '$i' [$cnt/${#vservers[@]}]" + } + + if pkgmgmt.isInternal "$i"; then + $_VSERVER "$i" exec apt-get "$@" + else + callInNamespace "$i" \ + "$_VNAMESPACE" --new -- "$_VAPT_GET_WORKER" "$i" "$@" + fi res=$? + + test $res -eq 0 -o -n "$is_quiet" || { + colorize error echo -n $"vapt-get failed on vserver '$i' with errorcode $res" + echo + } + + test -n "$is_quiet" || echo done test "$cnt" -ge 0 || echo "No vservers specified" >&2