From e12d03217430500be269392463876440210f7916 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 13 Aug 2018 21:20:56 -0400 Subject: makepkg: use bash 4.4 to localize `set` without explicitly saving/restoring Signed-off-by: Eli Schwartz Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 2d587883..25a8fc26 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -422,13 +422,14 @@ prepare_buildenv() { } run_function_safe() { - local restoretrap restoreset restoreshopt + local restoretrap restoreshopt # we don't set any special shopts of our own, but we don't want the user to # muck with our environment. restoreshopt=$(shopt -p) - restoreset=$(shopt -o -p) + # localize 'set' shell options to this function - this does not work for shopt + local - shopt -o -s errexit errtrace restoretrap=$(trap -p ERR) @@ -438,7 +439,6 @@ run_function_safe() { trap - ERR eval "$restoretrap" - eval "$restoreset" eval "$restoreshopt" } -- cgit v1.2.3-54-g00ecf