trap sig exit, too
The clean_temp() function failed to be called on a clean exit due to the previous change (446a58f). Also adding in the bit from die() that I failed to remember to push in. Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
parent
aa1894ba26
commit
ceffdf63e4
@ -230,7 +230,7 @@ die() {
|
|||||||
Easy-RSA error:
|
Easy-RSA error:
|
||||||
|
|
||||||
$1" 1>&2
|
$1" 1>&2
|
||||||
exit "${2:-1}"
|
prog_exit "${2:-1}"
|
||||||
} # => die()
|
} # => die()
|
||||||
|
|
||||||
# non-fatal warning output
|
# non-fatal warning output
|
||||||
@ -1319,7 +1319,7 @@ done
|
|||||||
vars_setup
|
vars_setup
|
||||||
|
|
||||||
# Register clean_temp and prog_exit on SIGHUP, SIGINT, SIGQUIT, and SIGABRT
|
# Register clean_temp and prog_exit on SIGHUP, SIGINT, SIGQUIT, and SIGABRT
|
||||||
trap "clean_temp; prog_exit" 1 2 3 6
|
trap "clean_temp; prog_exit" 0 1 2 3 6
|
||||||
|
|
||||||
# determine how we were called, then hand off to the function responsible
|
# determine how we were called, then hand off to the function responsible
|
||||||
cmd="$1"
|
cmd="$1"
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user