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/lint_pkgbuild/checkdepends.sh.in | 4 ++-- scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in | 4 ++-- scripts/libmakepkg/lint_pkgbuild/depends.sh.in | 4 ++-- scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'scripts/libmakepkg/lint_pkgbuild') diff --git a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in index fb289a67..d5648bd4 100644 --- a/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in @@ -37,8 +37,8 @@ lint_checkdepends() { get_pkgbuild_all_split_attributes checkdepends checkdepends_list - # 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 for checkdepend in "${checkdepends_list[@]}"; do diff --git a/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in index 8abad0b0..a18c25fa 100644 --- a/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in @@ -37,8 +37,8 @@ lint_conflicts() { get_pkgbuild_all_split_attributes conflicts conflicts_list - # 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 for conflict in "${conflicts_list[@]}"; do diff --git a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in index d90a15f8..40cdc65a 100644 --- a/scripts/libmakepkg/lint_pkgbuild/depends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/depends.sh.in @@ -37,8 +37,8 @@ lint_depends() { get_pkgbuild_all_split_attributes depends depends_list - # 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 for depend in "${depends_list[@]}"; do diff --git a/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in index 55ca4e28..4cc4ab5d 100644 --- a/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in +++ b/scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in @@ -37,8 +37,8 @@ lint_makedepends() { get_pkgbuild_all_split_attributes makedepends makedepends_list - # 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 for makedepend in "${makedepends_list[@]}"; do -- cgit v1.2.3-70-g09d2