From 48c8f9f2a24632dabe5b1c74a474e3940ddd8748 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 13 Aug 2018 21:20:57 -0400 Subject: makepkg: don't save the same shopts twice Both run_function and run_function_safe will save and restore `shopt -p` but the former is only called from the latter. It makes sense to save this as part of a "safe" runner, so let's just do it in one place, there where we save and restore everything else too. Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 39983fcd..76b9322a 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -447,9 +447,6 @@ run_function() { msg "$(gettext "Starting %s()...")" "$pkgfunc" cd_safe "$srcdir" - # save our shell options so pkgfunc() can't override what we need - local shellopts=$(shopt -p) - local ret=0 if (( LOGGING )); then local fullver=$(get_full_version) @@ -479,8 +476,6 @@ run_function() { else "$pkgfunc" fi - # reset our shell options - eval "$shellopts" } run_prepare() { -- cgit v1.2.3-54-g00ecf