fixed on_exit bug

goozbach · Jan 23, 2013 · f94982c · f94982c
1 parent f01ab83
commit f94982c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/src/bin/sample_app.sh b/src/bin/sample_app.sh
@@ -30,7 +30,7 @@ log_info "this is a log4bats function (https://github.com/goozbach/log4bats)"
 # create a tempfile
 log_info "creating temp file"
 TMPFILE=$(mktemp /tmp/${0##*/}-XXXXXXX)
-add_on_exit 'rm -rf ${TMPFILE}'
+add_on_exit "rm -rf ${TMPFILE}"
 
 # this command will fail thanks to stringent.sh
 log_info "attempting to overwrite tmp file, this should fail"

diff --git a/src/lib/20-on_exit b/src/lib/20-on_exit
@@ -2,7 +2,6 @@
 #sig term/quit handler to umount what we've mounted
 # take from: http://www.linuxjournal.com/content/use-bash-trap-statement-cleanup-temporary-files
 declare -a on_exit_items
-on_exit_items=''
 function on_exit()
 {
     for i in "${on_exit_items[@]}"
@@ -17,7 +16,7 @@ function add_on_exit()
     local n=${#on_exit_items[*]}
     on_exit_items[$n]="$*"
     if [[ $n -eq 0 ]]; then
-        log_trace "add_on_exit called, setting on_exit trap"
+        log_debug "add_on_exit called, setting on_exit trap"
         trap on_exit EXIT
     fi
 }