bgrun: fixup cleaning up

[etc/mutt.git] / .mutt / bgrun

diff --git a/.mutt/bgrun b/.mutt/bgrun
index 82e1748a448de9ccc91abebc53ec16084ab1ccbd..56c26e5b7a394964020bcb16d866d12c8a13e0b9 100755 (executable)
--- a/.mutt/bgrun
+++ b/.mutt/bgrun
@@ -9,7 +9,14 @@ elif [ -d "${TMPDIR}/volatile" ]; then
 fi
 export TMPDIR
 TMPDIR=$(mktemp -dp "$TMPDIR" mutt.XXXXXXXXXX)
-cleanup() { cd / && rm -rf "$TMPDIR"; }
+
+cleanup() {
+  cd /
+  echo Cleaning up $TMPDIR… >> $TMPDIR/output.stderr
+  notify_output
+  rm -rf "$TMPDIR"
+  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
 
 cd "$TMPDIR"
@@ -29,6 +36,13 @@ notify() {
   fi
 }
 
+notify_output() {
+  if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
+    notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
+      "Output from mutt/$SELF on $BASENAME"
+  fi
+}
+
 guess_extension() {
   python -c "import mimetypes; print(mimetypes.guess_extension('$1'))"
 }
@@ -52,13 +66,6 @@ get_file() {
   fi
 }
 
-notify_output() {
-  if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
-    notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
-      "Output from mutt/$SELF on $BASENAME"
-  fi
-}
-
 case "$SELF" in
   (bgrun)
     # make a copy of the file, then launch a shell process in the background
@@ -67,7 +74,6 @@ case "$SELF" in
     FILE="$(get_file "${1:-}")"
     (
       launch_viewer "$MIMETYPE" "$FILE"
-      notify_output
       sleep 1
       cleanup
     ) &
@@ -86,7 +92,6 @@ case "$SELF" in
     # the previous three lines:
     ## cat > "$FIFO" &
     launch_viewer "$MIMETYPE" "${FIFO}"
-    notify_output
     wait
     cleanup
     ;;
@@ -96,7 +101,12 @@ case "$SELF" in
     # cases when the FIFO method doesn't work, because e.g. Firefox randomly
     # chooses it needs to read HTML files twice.
     FILE="$(get_file "${1:-}")"
-    (launch_viewer "$MIMETYPE" "${FILE}" && notify_output) &
-    (sleep 1m && cleanup) &
+    (launch_viewer "$MIMETYPE" "${FILE}") &
+    (
+      sleep 1m
+      echo Cleaning up $TMPDIR… > $TMPDIR/output.stderr
+      cleanup
+    ) &
+    trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
     ;;
 esac