bgrun: factor out notifying about viewer output

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

diff --git a/.mutt/bgrun b/.mutt/bgrun
index 4dcd3e21cf8280a3719f8315d8657220dc1ef4c8..c51ea901b6e7c597792ffeda5d57d9fa30d1f00d 100755 (executable)
--- a/.mutt/bgrun
+++ b/.mutt/bgrun
@@ -46,12 +46,19 @@ get_file() {
     cat > "$t"
     echo "$t"
   else
     cat > "$t"
     echo "$t"
   else

-    t="$(echo ${1##*/} | sed -re 's![^[:alnum:],.:@%^+=_-]!_!gi')"
+    t="$(echo ${1##*/} | sed -re 's![^[:alnum:],.@%^+=_-]!_!gi')"

     cp "$1" "$t"
     echo "$t"
   fi
 }
 
     cp "$1" "$t"
     echo "$t"
   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
 case "$SELF" in
   (bgrun)
     # make a copy of the file, then launch a shell process in the background


@@ -60,10 +67,7 @@ case "$SELF" in
     FILE="$(get_file "${1:-}")"
     (
       launch_viewer "$MIMETYPE" "$FILE"
     FILE="$(get_file "${1:-}")"
     (
       launch_viewer "$MIMETYPE" "$FILE"

-      if [ -s "$TMPDIR/output.stdout" ] || [ -s "$TMPDIR/output.stderr" ]; then
-        notify $TMPDIR/output.stdout $TMPDIR/output.stderr \
-          "Output from mutt/$SELF on $BASENAME"
-      fi
+      notify_output

       sleep 1
       cleanup
     ) &
       sleep 1
       cleanup
     ) &


@@ -82,6 +86,7 @@ case "$SELF" in
     # the previous three lines:
     ## cat > "$FIFO" &
     launch_viewer "$MIMETYPE" "${FIFO}"
     # the previous three lines:
     ## cat > "$FIFO" &
     launch_viewer "$MIMETYPE" "${FIFO}"

+    notify_output

     wait
     cleanup
     ;;
     wait
     cleanup
     ;;