X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvpkg;h=69d5b5b11ae476f236e44d19d71434f8e4c064a6;hb=75de7ac21731b972fb4a423325642066a2ee03f5;hp=7e065e803192a305e042d9bfb9701ab69c1723d1;hpb=d45518897217889e8571d94d4459ee12c4db56a0;p=util-vserver.git diff --git a/util-vserver/scripts/vpkg b/util-vserver/scripts/vpkg index 7e065e8..69d5b5b 100755 --- a/util-vserver/scripts/vpkg +++ b/util-vserver/scripts/vpkg @@ -19,7 +19,7 @@ : ${UTIL_VSERVER_VARS:=/usr/lib/util-vserver/util-vserver-vars} test -e "$UTIL_VSERVER_VARS" || { - echo "Can not find util-vserver installation; aborting..." >&2 + echo $"Can not find util-vserver installation (the file '$UTIL_VSERVER_VARS' would be expected); aborting..." >&2 exit 1 } . "$UTIL_VSERVER_VARS" @@ -84,14 +84,14 @@ case "$style" in ## rpm outputs sometimes '(contains no files)', so return ## only the valid output (get-conffiles) - rpm_param=( -qac --pipe "sed '\!^/!p;d'" );; + rpm_param=( -qac --pipe "$_SED '\!^/!p;d'" );; (install) rpm_param=( -Uvh "$@" ) apt_param=( install "$@" ) ;; esac - if test "$is_external"; then + if test -n "$is_external"; then have_apt=1 test -d "$cfgdir"/base/apt -o -d "$cfgdir"/aptetc || have_apt= else @@ -101,7 +101,7 @@ case "$style" in done fi - if test "$is_external"; then + if test -n "$is_external"; then if test "$have_apt" -a "$apt_param"; then cmd=( "$_VAPT_GET" "$vserver" -- "${apt_param[@]}" ) else @@ -125,7 +125,7 @@ case "$style" in ;; esac - if test "$is_external"; then + if test -n "$is_external"; then echo $"'external' packagemanagement is not supported for Debian" >&2 exit 1 else