move cleanup to earlier in script

Signed-off-by: martin f. krafft <madduck@madduck.net>

diff --git a/pulserecorder b/pulserecorder
index 65a40ce086dfc6dff5dda6db07701b528ac45d4b..a9f4cdca1c3be5484ebcabf41765bcfb02ee0e2f 100755 (executable)
--- a/pulserecorder
+++ b/pulserecorder
@@ -20,6 +20,17 @@
 #
 set -eu
 
 #
 set -eu
 

+cleanup_commands=
+cleanup() {
+  set +e
+  eval $cleanup_commands 2>/dev/null
+  trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+}
+trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+cleanup_hook() {
+  cleanup_commands="$@${cleanup_commands:+; $cleanup_commands}"
+}
+

 if [ -z "${TMPDIR:-}" ]; then
   TMPDIR=/tmp
 fi
 if [ -z "${TMPDIR:-}" ]; then
   TMPDIR=/tmp
 fi


@@ -31,17 +42,8 @@ for i in $LOGNAME volatile; do
 done
 export TMPDIR
 TMPDIR=$(mktemp -dp "$TMPDIR" parec.XXXXXXXXXX)
 done
 export TMPDIR
 TMPDIR=$(mktemp -dp "$TMPDIR" parec.XXXXXXXXXX)

+cleanup_hook rm -r $TMPDIR

 
 

-cleanup_commands="rm -r $TMPDIR"
-cleanup() {
-  set +e
-  eval $cleanup_commands 2>/dev/null
-  trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
-}
-trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15
-cleanup_hook() {
-  cleanup_commands="$@${cleanup_commands:+; $cleanup_commands}"
-}

 
 state= outfile= index= clobber=0
 for arg in "$@"; do
 
 state= outfile= index= clobber=0
 for arg in "$@"; do