diff options
| author | Dan McGee <dan@archlinux.org> | 2011-10-14 00:26:17 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-14 15:16:06 +0200 |
| commit | 020bdb4298cd1bc53df7ca4d911cda7aaa65329c (patch) | |
| tree | f1243986719e372b60437e1f8ab2cd6c6673cfe1 | |
| parent | 185cbb8a44d9e084580d6a9f4ca004c20ee90103 (diff) | |
| download | pacman-020bdb4298cd1bc53df7ca4d911cda7aaa65329c.tar.gz pacman-020bdb4298cd1bc53df7ca4d911cda7aaa65329c.tar.xz | |
makepkg: don't attach traps until after argument parsing
Nothing we do in our traps is necessary this early in the script. This
fixes FS#26196.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 09c1e963..3085bf59 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -174,17 +174,6 @@ clean_up() { } -## -# Signal Traps -## -set -E -trap 'clean_up' 0 -for signal in TERM HUP QUIT; do - trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" -done -trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT -trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR - enter_fakeroot() { msg "$(gettext "Entering %s environment...")" "fakeroot" @@ -1956,6 +1945,15 @@ while true; do shift done +# setup signal traps +trap 'clean_up' 0 +for signal in TERM HUP QUIT; do + trap "trap_exit \"$(gettext "%s signal caught. Exiting...")\" \"$signal\"" "$signal" +done +trap 'trap_exit "$(gettext "Aborted by user! Exiting...")"' INT +trap 'trap_exit "$(gettext "An unknown error has occurred. Exiting...")"' ERR +set -E + # preserve environment variables and canonicalize path [[ -n ${PKGDEST} ]] && _PKGDEST=$(canonicalize_path ${PKGDEST}) [[ -n ${SRCDEST} ]] && _SRCDEST=$(canonicalize_path ${SRCDEST}) |