X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvapt-get;h=5cdf1a31eeadb85dd82fb2e6907ea5455c192f60;hb=e2770a5bfa046e037e4e4feddef4fd4750389033;hp=36f8a4afa4fa360549a212622da3be491a23f49f;hpb=416c3b76d5d3c68f5a606fe110d157e5d8cf7386;p=util-vserver.git diff --git a/util-vserver/scripts/vapt-get b/util-vserver/scripts/vapt-get index 36f8a4a..5cdf1a3 100755 --- a/util-vserver/scripts/vapt-get +++ b/util-vserver/scripts/vapt-get @@ -16,50 +16,48 @@ # 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() { - cat <* [--all] -- + - -Report bugs to <$PACKAGE_BUGREPORT>. -EOF + 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 cnt=$[ cnt + 1 ] - _APT_GET=apt-get \ - "$_NEW_NAMESPACE" "$_VAPT_GET_WORKER" "$i" "$@" + + test "$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 "$is_quiet" || { + colorize error echo -n $"vapt-get failed on vserver '$i' with errorcode $res" + echo + } + + test "$is_quiet" || echo done test "$cnt" -ge 0 || echo "No vservers specified" >&2