summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2013-04-25 19:13:54 -0400
committerLuke Shumaker <lukeshu@lukeshu.com>2017-03-25 12:31:45 -0400
commitae6f374c210835546f8f57b41e5764d87fca3fcb (patch)
tree120ae499eba76e5f645760bcf355504ec39db435
parentbde110be503c714b8bbbc85b3200e498be5423ec (diff)
lib/common.sh: Make setup_workdir()/cleanup() safe for programs to not uselukeshu/to-upstream/common.sh-20170325
-rw-r--r--lib/common.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/common.sh b/lib/common.sh
index 6d873ed..5ef9f97 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -59,12 +59,18 @@ stat_done() {
printf "${BOLD}done${ALL_OFF}\n" >&2
}
+_setup_workdir=false
setup_workdir() {
[[ -z $WORKDIR ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")
+ _setup_workdir=true
+ trap 'trap_abort' INT QUIT TERM HUP
+ trap 'trap_exit' EXIT
}
cleanup() {
- [[ -n $WORKDIR ]] && rm -rf "$WORKDIR"
+ if [[ -n $WORKDIR ]] && $_setup_workdir; then
+ rm -rf "$WORKDIR"
+ fi
exit ${1:-0}
}
@@ -89,9 +95,6 @@ die() {
cleanup 255
}
-trap 'trap_abort' INT QUIT TERM HUP
-trap 'trap_exit' EXIT
-
##
# usage : in_array( $needle, $haystack )
# return : 0 - found