[pacman-dev] [PATCH 2/6] libmakepkg: extract in_array

[Allan McRae]

---
 scripts/Makefile.am             |  3 ++-
 scripts/libmakepkg/.gitignore   |  2 +-
 scripts/libmakepkg/util/util.sh | 38 ++++++++++++++++++++++++++++++++++++++
 scripts/makepkg.sh.in           | 14 --------------
 4 files changed, 41 insertions(+), 16 deletions(-)
 create mode 100644 scripts/libmakepkg/util/util.sh

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 3dfd903..4a54b8d 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -48,7 +48,8 @@ LIBMAKEPKGDIRS = \
 LIBMAKEPKG = \
 	libmakepkg/util/message.sh \
 	libmakepkg/util/option.sh \
-	libmakepkg/util/pkgbuild.sh
+	libmakepkg/util/pkgbuild.sh \
+	libmakepkg/util/util.sh
 
 LIBMAKEPKG_IN = \
 	libmakepkg/lint_package.sh \
diff --git a/scripts/libmakepkg/.gitignore b/scripts/libmakepkg/.gitignore
index 6101db4..46d8fc1 100644
--- a/scripts/libmakepkg/.gitignore
+++ b/scripts/libmakepkg/.gitignore
@@ -11,4 +11,4 @@ tidy/staticlibs.sh
 tidy/strip.sh
 tidy/upx.sh
 tidy/zipman.sh
-util.sh
+/util.sh
diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh
new file mode 100644
index 0000000..307464e
--- /dev/null
+++ b/scripts/libmakepkg/util/util.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+#
+#   util.sh - general utility functions
+#
+#   Copyright (c) 2006-2015 Pacman Development Team <pacman-dev at archlinux.org>
+#   Copyright (c) 2002-2006 by Judd Vinet <jvinet at zeroflux.org>
+#
+#   This program is free software; you can redistribute it and/or modify
+#   it under the terms of the GNU General Public License as published by
+#   the Free Software Foundation; either version 2 of the License, or
+#   (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be useful,
+#   but WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#   GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+[ -n "$LIBMAKEPKG_UTIL_UTIL_SH" ] && return
+LIBMAKEPKG_UTIL_UTIL_SH=1
+
+
+##
+#  usage : in_array( $needle, $haystack )
+# return : 0 - found
+#          1 - not found
+##
+in_array() {
+	local needle=$1; shift
+	local item
+	for item in "$@"; do
+		[[ $item = "$needle" ]] && return 0 # Found
+	done
+	return 1 # Not Found
+}
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index a6e37ee..a00e8a4 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -889,20 +889,6 @@ get_pkg_arch() {
 	fi
 }
 
-##
-#  usage : in_array( $needle, $haystack )
-# return : 0 - found
-#          1 - not found
-##
-in_array() {
-	local needle=$1; shift
-	local item
-	for item in "$@"; do
-		[[ $item = "$needle" ]] && return 0 # Found
-	done
-	return 1 # Not Found
-}
-
 source_has_signatures() {
 	local file all_sources
 
-- 
2.4.0