From 3cb1669e07106e9108976a76b7d2f37e659bce6c Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Sun, 7 Feb 2016 21:27:31 +1000 Subject: libmakepkg: increase robustness of the detection of array variables Extract array detection into its own utility function that ensures extglob is enabled. Suggested-by: Dave Reisner Signed-off-by: Allan McRae --- scripts/libmakepkg/util/util.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'scripts/libmakepkg/util') diff --git a/scripts/libmakepkg/util/util.sh b/scripts/libmakepkg/util/util.sh index 3c996dac..675e75de 100644 --- a/scripts/libmakepkg/util/util.sh +++ b/scripts/libmakepkg/util/util.sh @@ -37,6 +37,23 @@ in_array() { return 1 # Not Found } +# tests if a variable is an array +is_array() { + local v=$1 + local ret=1 + + # this function requires extglob - save current options to restore later + local shellopts=$(shopt -p) + shopt -s extglob + + if [[ $(declare -p "$i") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then + ret=0 + fi + + eval "$shellopts" + return $ret +} + # Canonicalize a directory path if it exists canonicalize_path() { local path="$1"; -- cgit v1.2.3