diff options
author | Dan McGee <dan@archlinux.org> | 2011-10-13 18:25:09 +0200 |
---|---|---|
committer | Dan McGee <dan@archlinux.org> | 2011-10-13 18:25:50 +0200 |
commit | ff8704635440fe890ac8621722cc8301a3875e48 (patch) | |
tree | 2e932feb61e23808c2d68c347381f4fa3e81f7f7 /scripts/makepkg.sh.in | |
parent | 35e6136f4b1b45a7cb736ca0608da7f44c74b233 (diff) | |
parent | 04fd320e97770911894fb06ba98f3c17fc30c7d9 (diff) | |
download | pacman-ff8704635440fe890ac8621722cc8301a3875e48.tar.gz pacman-ff8704635440fe890ac8621722cc8301a3875e48.tar.xz |
Merge branch 'maint'
Conflicts:
src/pacman/util.c
Diffstat (limited to 'scripts/makepkg.sh.in')
-rw-r--r-- | scripts/makepkg.sh.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 50cf2725..09c1e963 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -179,7 +179,9 @@ clean_up() { ## set -E trap 'clean_up' 0 -trap 'trap_exit "$(gettext "TERM signal caught. Exiting...")"' TERM HUP QUIT +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 |