X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Fvprocunhide;h=31c17f712f9cf2efbff8a0091b4fc6fbc9bc790e;hb=5b39edfee423f5f3cbe8fa223dcfdc9e8d66e286;hp=20f858bfc4b527ba68e461096feab0ff249d85c6;hpb=8344f72ad247f8be7fcf2cdf70135fcf7766ef52;p=util-vserver.git diff --git a/util-vserver/scripts/vprocunhide b/util-vserver/scripts/vprocunhide index 20f858b..31c17f7 100755 --- a/util-vserver/scripts/vprocunhide +++ b/util-vserver/scripts/vprocunhide @@ -1,4 +1,5 @@ #!/bin/bash +# $Id$ # # Copyright (C) 2004 Enrico Scholz # @@ -18,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" @@ -32,7 +33,7 @@ function showHelp() Return values: 0 ... no errors 1 ... configuration error - 2 ... some files where changes but there occured errors on other ones + 2 ... some files were changed but errors occured on other ones 3 ... operation failed on every file Report bugs to <$PACKAGE_BUGREPORT>." @@ -52,7 +53,7 @@ the GNU General Public License. This program has absolutely no warranty." } -while test "$1"; do +while test -n "$1"; do case "$1" in --help) showHelp;; --version) showVersion;; @@ -60,8 +61,8 @@ while test "$1"; do done findFile UNHIDEFILE \ - "$CONFDIR"/.defaults/apps/vprocunhide/files \ - "$PKGLIBDEFAULTDIR"/vprocunhide-files + "$__CONFDIR"/.defaults/apps/vprocunhide/files \ + "$__PKGLIBDEFAULTDIR"/vprocunhide-files ok=1 passed= @@ -70,8 +71,8 @@ while read filename; do case "$filename" in (\#*) continue;; + (\~*) params=( --admin --watch --hide ); filename=${filename#\~};; (-*) params=( --admin --hide ); filename=${filename#-};; - (~*) params=( --admin --watch --hide ); filename=${filename#~};; (:*) params=( --watch --hide ); filename=${filename#:};; (!*) params=( --hide ); filename=${filename#!};; (+*) params=( --!hide ); filename=${filename#+};; @@ -89,6 +90,6 @@ while read filename; do $_SETATTR -x "${params[@]}" "$@" && passed=1 || ok= done <"$UNHIDEFILE" -test "$ok" && exit 0 || \ -test "$passed" && exit 2 || \ +test -n "$ok" && exit 0 || \ +test -n "$passed" && exit 2 || \ exit 3