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:
Eric F Crist 2018-10-02 17:06:36 -05:00
parent aaf8e3d0d4
commit e11b8566fe
No known key found for this signature in database
GPG Key ID: 72964219390D0D0E

View File

@ -230,7 +230,7 @@ die() {
Easy-RSA error:
$1" 1>&2
exit "${2:-1}"
prog_exit "${2:-1}"
} # => die()
# non-fatal warning output
@ -1319,7 +1319,7 @@ done
vars_setup
# 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
cmd="$1"