]> git.madduck.net Git - etc/mutt.git/blobdiff - .mutt/bgrun

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

improved tempfile handling
[etc/mutt.git] / .mutt / bgrun
index e0bcd20dc8682cf77389e7cac92fab008214a040..260925c272977c36701c26c41524e17f2c1603ba 100755 (executable)
@@ -9,10 +9,10 @@ elif [ -d "${TMPDIR}/volatile" ]; then
 fi
 export TMPDIR
 TMPDIR=$(mktemp -dp "$TMPDIR" mutt.XXXXXXXXXX)
-trap "rm -rf '$TMPDIR'" 1 2 3 4 5 6 7 8 10 11 12 13 14 15
+cleanup() { cd / && rm -rf "$TMPDIR"; }
+trap cleanup 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 
-BASENAME="${1##*/}"
-TEMPFILE="${TMPDIR}/${BASENAME}"
+cd "$TMPDIR"
 
 notify() {
   if [ -x "$(command -v awesome-client)" ]; then
@@ -38,11 +38,11 @@ case "$SELF" in
     MIMETYPE="$2"
     (
       run-mailcap --action=view "$MIMETYPE":"$TEMPFILE"
-      rm -rf "$TMPDIR"
       if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
         notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
           "Output from mutt/$SELF on $BASENAME"
       fi
+      cleanup
     ) &
     trap - 1 2 3 4 5 6 7 8 10 11 12 13 14 15
     ;;
@@ -55,6 +55,6 @@ case "$SELF" in
     cat "$INPUTFILE" > $TEMPFILE &
     sensible-browser "$TEMPFILE" > $TMPDIR/output.stdout 2> $TMPDIR/output.stderr
     wait
+    cleanup
     ;;
 esac
-