X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=util-vserver%2Fscripts%2Ffunctions;h=c874b14f7aec5e9dd29254c5ad3c6ce9f49a5195;hb=3373d861ddf49f31ae5bb8ce67a9769053d67860;hp=966cacf6327afa997e62114608cb7182bc1b8696;hpb=9c55b6053c94c89ae5f8452878ee23c8f5988294;p=util-vserver.git diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index 966cacf..c874b14 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -24,23 +24,23 @@ declare -r _VS_NEWLINE=${_VS_NEWLINE:0-1} function findObject { - local mod=$1 - local var=$2 - local file= - local i=X + local _fo_mod=$1 + local _fo_var=$2 + local _fo_file= + local _fo_i=X shift 2 - for i; do - test "$i" || continue - test ! $mod "$i" || { file=$i; break; } + for _fo_i; do + test -n "$_fo_i" || continue + test ! $_fo_mod "$_fo_i" || { _fo_file=$_fo_i; break; } done - test -z "$i" -o "$file" || { - echo "Can not find file for '$var'; aborting" + test -z "$_fo_i" -o -n "$_fo_file" || { + echo "Can not find file for '$_fo_var'; aborting" exit 1 } >&2 - eval "$var=\"$file\"" + eval "$_fo_var=\"$_fo_file\"" } function findFile @@ -62,8 +62,8 @@ function findAndCopy shift findFile tmp "$@" - test "$tmp" -a -s "$tmp" || return 0 - cp -af "$tmp" "$dst" + test -n "$tmp" -a -s "$tmp" || return 0 + $_CP -af "$tmp" "$dst" } function getPhysicalDir @@ -74,7 +74,7 @@ function getPhysicalDir ## Usage: logging function logging { - if test "$_VS_LOGFILE"; then + if test -n "$_VS_LOGFILE"; then echo "$@" >>"$_VS_LOGFILE" else echo "$@" @@ -84,7 +84,7 @@ function logging ## Usage: warning function warning { - if test "$_VS_ERRFILE"; then + if test -n "$_VS_ERRFILE"; then echo "$@" >>"$_VS_ERRFILE" else echo "$@" >&2 @@ -94,7 +94,7 @@ function warning ## Usage: panic function panic { - if test "$_VS_ERRFILE"; then + if test -n "$_VS_ERRFILE"; then echo "$@" >>"$_VS_ERRFILE" else echo "$@" >&2 @@ -115,20 +115,56 @@ function execute function isNumber { local tmp - let tmp=$1+0 2>/dev/null || test -z "${1//0/}" -a "$1" || return 1 + let tmp=$1+0 2>/dev/null || test -z "${1//0/}" -a -n "$1" || return 1 return 0 } +## Usage: colorize