diff options
| author | Allan McRae <allan@archlinux.org> | 2012-03-31 17:26:39 +1000 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-04-08 21:52:42 -0500 |
| commit | 31091963edaa505d00642aecb9950ce087a40b73 (patch) | |
| tree | 01802f68c81269e810323ed41ac98185abfbf39a | |
| parent | 468270ce4f3b47e93e7c25796e499dc30d3ce74a (diff) | |
| download | pacman-31091963edaa505d00642aecb9950ce087a40b73.tar.gz pacman-31091963edaa505d00642aecb9950ce087a40b73.zip | |
makepkg: save and restore shopts when sourcing /etc/profile
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 437a1929..46191ee4 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -473,7 +473,11 @@ handle_deps() { fi # we might need the new system environment + # save our shell options and turn off extglob + local shellopts=$(shopt -p) + shopt -u extglob source /etc/profile &>/dev/null + eval "$shellopts" return $R_DEPS_SATISFIED } |