migrate from tempfile to mktemp

[etc/mutt.git] / .mutt / reuse-message

diff --git a/.mutt/reuse-message b/.mutt/reuse-message
index c833bd3e85419e9bf44cf2a7560b29870466b2f9..0d8ed2341f5d524c1b1103fc1a7a111186e85819 100755 (executable)
--- a/.mutt/reuse-message
+++ b/.mutt/reuse-message
@@ -2,15 +2,16 @@
 set -eu
 
 eval mailfile="\${$#}"
 set -eu
 
 eval mailfile="\${$#}"

+editor=

 for i in "$@"; do
   # strip last argument from editor, yuk
   case "$i" in
 for i in "$@"; do
   # strip last argument from editor, yuk
   case "$i" in

-    ($mailfile) break;;
+    ("$mailfile") break;;

     (*) editor="${editor:+$editor }$i";;
   esac
 done
 
     (*) editor="${editor:+$editor }$i";;
   esac
 done
 

-tmpfile=$(tempfile -p reuse)
+tmpfile=$(mktemp --tmpdir reuse.XXXXXXXXXX)

 cleanup() { rm -f "$tmpfile"; 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() { rm -f "$tmpfile"; 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
 


@@ -20,8 +21,12 @@ formail -I Subject: < "$mailfile" | \
   sed -e '/^Bcc:/aSubject: ' > "$tmpfile"
 cat "$tmpfile" > "$mailfile"
 
   sed -e '/^Bcc:/aSubject: ' > "$tmpfile"
 cat "$tmpfile" > "$mailfile"
 

+cleanup
+

 if [ -n "$editor" ]; then
   eval exec "$editor" "$mailfile"
 if [ -n "$editor" ]; then
   eval exec "$editor" "$mailfile"

+
+# the last three replicate mutt's default (cf. manual)

 elif [ -n "$VISUAL" ]; then
   eval exec "$VISUAL" "$mailfile"
 elif [ -n "$EDITOR" ]; then
 elif [ -n "$VISUAL" ]; then
   eval exec "$VISUAL" "$mailfile"
 elif [ -n "$EDITOR" ]; then