From 542c3cf812e32989610cb09f40dbc237f2fba9bb Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 2 May 2018 14:24:44 -0400 Subject: libmakepkg: only save the shellopts we need micro-optimization: We only care about temporarily enforcing extglob, so that is the only one we need to explicitly restore. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/libmakepkg/util/pkgbuild.sh.in | 4 ++-- scripts/libmakepkg/util/util.sh.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/libmakepkg/util') diff --git a/scripts/libmakepkg/util/pkgbuild.sh.in b/scripts/libmakepkg/util/pkgbuild.sh.in index 2db46f1f..632f314d 100644 --- a/scripts/libmakepkg/util/pkgbuild.sh.in +++ b/scripts/libmakepkg/util/pkgbuild.sh.in @@ -80,8 +80,8 @@ extract_function_variable() { printf -v attr_regex '^[[:space:]]* %s\+?=[^(]' "$2" fi - # save our shell options and turn on extglob - local shellopts=$(shopt -p) + # this function requires extglob - save current status to restore later + local shellopts=$(shopt -p extglob) shopt -s extglob while read -r; do diff --git a/scripts/libmakepkg/util/util.sh.in b/scripts/libmakepkg/util/util.sh.in index f9af5f32..726d2005 100644 --- a/scripts/libmakepkg/util/util.sh.in +++ b/scripts/libmakepkg/util/util.sh.in @@ -42,8 +42,8 @@ is_array() { local v=$1 local ret=1 - # this function requires extglob - save current options to restore later - local shellopts=$(shopt -p) + # this function requires extglob - save current status to restore later + local shellopts=$(shopt -p extglob) shopt -s extglob if [[ $(declare -p "$v") == declare\ -*([[:alnum:]])a*([[:alnum:]])\ * ]]; then -- cgit v1.2.3-70-g09d2