Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2018-05-02 14:24:44 -0400
committerAllan McRae <allan@archlinux.org>2018-05-12 21:11:52 +1000
commit542c3cf812e32989610cb09f40dbc237f2fba9bb (patch)
tree16e7eb0b36d8d61dc93a3fe6cd0aaa5e888e0940 /scripts
parent2c94118dc168f16231e38a84c0b569b5b0006fd9 (diff)
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 <eschwartz@archlinux.org> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/checkdepends.sh.in4
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/conflicts.sh.in4
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/depends.sh.in4
-rw-r--r--scripts/libmakepkg/lint_pkgbuild/makedepends.sh.in4
-rw-r--r--scripts/libmakepkg/util/pkgbuild.sh.in4
-rw-r--r--scripts/libmakepkg/util/util.sh.in4
-rw-r--r--scripts/makepkg.sh.in2
7 files changed, 13 insertions, 13 deletions
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
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
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index be80cc0e..64276c5d 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -275,7 +275,7 @@ handle_deps() {
# we might need the new system environment
# save our shell options and turn off extglob
- local shellopts=$(shopt -p)
+ local shellopts=$(shopt -p extglob)
shopt -u extglob
source /etc/profile &>/dev/null
eval "$shellopts"