diff options
| author | Austin Lund <austin.lund@gmail.com> | 2019-08-27 08:14:07 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2019-10-07 08:21:24 +0200 |
| commit | e581068c77baa7a167662b0c63730dc87cc90b81 (patch) | |
| tree | 1fb640680fa03937fbee9bc1663d17704151e24b | |
| parent | 8f89e509d2f3d369cb5adb30dd85713ff1c5305c (diff) | |
| download | pacman-e581068c77baa7a167662b0c63730dc87cc90b81.tar.gz pacman-e581068c77baa7a167662b0c63730dc87cc90b81.tar.xz | |
makepkg: Delete logpipe when exiting
The logpipe fifo can remain when exiting on a non-error condition such
as recieving signals INT and USR1. This can be seen by doing either a
manual CTRL-C to interrupt the build or by sending a signal such as:
$ makepkg & sleep 5 ; kill -USR1 $!
Remove the fifo in all cases on script exit if it still exists.
Signed-off-by: Austin Lund <austin.lund@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | scripts/makepkg.sh.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 43484db3..fac268a8 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -129,6 +129,10 @@ clean_up() { return 0 fi + if [[ -p $logpipe ]]; then + rm "$logpipe" + fi + if (( (EXIT_CODE == E_OK || EXIT_CODE == E_INSTALL_FAILED) && CLEANUP )); then local pkg file @@ -343,9 +347,6 @@ remove_deps() { } error_function() { - if [[ -p $logpipe ]]; then - rm "$logpipe" - fi # first exit all subshells, then print the error if (( ! BASH_SUBSHELL )); then error "$(gettext "A failure occurred in %s().")" "$1" |