From 9c920cd09d1b0a9a53a4ac62981ed41431a610df Mon Sep 17 00:00:00 2001
From: Victor Lowther <victor.lowther@gmail.com>
Date: Mon, 7 Jun 2010 07:23:30 -0500
Subject: Simplify in_array.

All that extra checking for the first character being @ is not needed,
simple parameter expansion will trim it off if it is there.
---
 functions | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'functions')

diff --git a/functions b/functions
index 126546a..8b4ac18 100644
--- a/functions
+++ b/functions
@@ -136,17 +136,13 @@ status() {
 #          1 - not found
 # Copied from makepkg
 in_array() {
-  local needle=$1; shift
-  [ -z "$1" ] && return 1 # Not Found
-  local item
-  for item in "$@"; do
-    local c="${item:0:1}"
-    if [ "x$c" = "x@" ]; then
-      item="${item:1}"
-    fi
-    [ "$item" = "$needle" ] && return 0 # Found
-  done
-  return 1 # Not Found
+    [[ $2 ]] || return 1
+    local needle=$1; shift
+    local item
+    for item in "$@"; do
+	[[ ${item#@} = $needle ]] && return 0
+    done
+    return 1 # Not Found
 }
 
 # daemons:
-- 
cgit v1.2.3