diff options
| author | Dan McGee <dan@archlinux.org> | 2011-10-14 15:16:18 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-10-14 15:16:18 +0200 |
| commit | a33424f87955c43652a61fcef5817df07e17bee3 (patch) | |
| tree | 2688165e953384b89d472dc887c876bd88306223 /scripts | |
| parent | dbd54c0cb95c5d9c914e5d99b23556d2528ee9b9 (diff) | |
| parent | 020bdb4298cd1bc53df7ca4d911cda7aaa65329c (diff) | |
| download | pacman-a33424f87955c43652a61fcef5817df07e17bee3.tar.gz pacman-a33424f87955c43652a61fcef5817df07e17bee3.tar.xz | |
Merge branch 'maint'
Diffstat (limited to 'scripts')
| -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}) |