From 6f20b17624a1fb9c6e4d6fd1ba4efaf463209065 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sat, 28 Feb 2009 18:02:11 +0100 Subject: check_is_in fixes.. and this time i mean it.. i think. hopefully. + test script for check_is_in --- src/core/libs/lib-misc.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/core/libs/lib-misc.sh') diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh index 97252b9..6f7af95 100644 --- a/src/core/libs/lib-misc.sh +++ b/src/core/libs/lib-misc.sh @@ -46,18 +46,20 @@ wait_for () } -# $1 set (array) haystack -# $2 needle +# $1 needle +# $2 set (array) haystack check_is_in () { - [ -z "$1" ] && debug 'MISC' "check_is_in $1 $2" && die_error "check_is_in needs a non-empty needle as \$2 and a haystack as \$1!" # haystack can be empty though + [ -z "$1" ] && debug 'MISC' "check_is_in $1 $2" && die_error "check_is_in needs a non-empty needle as \$1 and a haystack as \$2!" # haystack can be empty though local pattern="$1" element shift for element do - [[ $element = $pattern ]] && return 0 + [[ $element = $pattern ]] && debug 'MISC' "Checking if $element = $pattern ..yes !" && return 0 + debug 'MISC' "Checking if $element = $pattern ... no" done + debug 'MISC' "Check_is_in could not find $1 in $2" return 1 } -- cgit v1.2.3-54-g00ecf