From: Enrico Scholz Date: Thu, 28 Apr 2005 18:02:27 +0000 (+0000) Subject: * isRegularFile(): fixed evaluation of params X-Git-Tag: version_0_30_210~217 X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b9fb40f99d608f05825237f3d372658d3761520;p=util-vserver.git * isRegularFile(): fixed evaluation of params * hasSubstring(): added * getAllVservers(): fixed typo git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2064 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- diff --git a/util-vserver/scripts/functions b/util-vserver/scripts/functions index 017bb07..009bcc1 100644 --- a/util-vserver/scripts/functions +++ b/util-vserver/scripts/functions @@ -70,9 +70,9 @@ function findAndCopy ## Usage: isRegularFile [] function isRegularFile { - test ${mod:--f} "$1" || return 1 + test ${2:--f} "$1" || return 1 - case $file in + case $1 in (*.rpmsave|*.rpmnew|*.rpmorig|*.cfsaved*|*.~*~) return 1;; esac @@ -140,6 +140,22 @@ function isNumber return 0 } +## Usage: hasSubstring + +function hasSubstring +{ + local pat=$1 + local i + + shift + + for i; do + test x"${pat/*$i*/$i}" = x"$i" || continue + return 0 + done + + return 1 +} + ## Usage: colorize