migrate from tempfile to mktemp

diff --git a/.mutt/bgrun b/.mutt/bgrun
index c19920f56abc654805308fd1ceae5006f17ad1bb..ad432dfc8b8ea892e86c6b9045adb83de755afb3 100755 (executable)
--- a/.mutt/bgrun
+++ b/.mutt/bgrun
@@ -83,7 +83,7 @@ guess_extension() {
 get_file() {
   local t
   if [ -z "$1" ]; then
 get_file() {
   local t
   if [ -z "$1" ]; then

-    t=$(TMPDIR="$PWD" tempfile -s $(guess_extension "$MIMETYPE"))
+    t=$(mktemp -p "$PWD" tmp.XXXXXXXXXX.$(guess_extension "$MIMETYPE"))

     cat > "$t"
     echo "$t"
   else
     cat > "$t"
     echo "$t"
   else

diff --git a/.mutt/filter-proxy b/.mutt/filter-proxy
index a2cf5808260cd7eb9c2b8b0869786725660d26cf..e0b1ad2982edc67e8551609611b07f436410de88 100755 (executable)
--- a/.mutt/filter-proxy
+++ b/.mutt/filter-proxy
@@ -21,7 +21,7 @@ while [ -n "${1:-}" ]; do
   shift
 done
 
   shift
 done
 

-TMPFILE="$(tempfile -p proxy)"
+TMPFILE="$(mktemp --tmpdir proxy.XXXXXXXXXX)"

 trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 
 eval $cmd <"$file" >$TMPFILE
 trap "rm -f $TMPFILE" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15
 
 eval $cmd <"$file" >$TMPFILE

diff --git a/.mutt/reuse-message b/.mutt/reuse-message
index 0bdb3f83cb4b1026edec96d0299d3e26c6a66d89..0d8ed2341f5d524c1b1103fc1a7a111186e85819 100755 (executable)
--- a/.mutt/reuse-message
+++ b/.mutt/reuse-message
@@ -11,7 +11,7 @@ for i in "$@"; do
   esac
 done
 
   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
 

diff --git a/.mutt/sendmail b/.mutt/sendmail
index b125941554d8dace86a6ee509e7fc8b439dad253..80fd4a1bba72f221c5fd2a7050297ec5ac00306f 100755 (executable)
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -10,12 +10,12 @@
 # Copyright © 2010 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
 # Copyright © 2010 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #

-set -eu
+set -eux

 
 CHECKSDIR="$HOME/.mutt/sendmail-checks.d"
 SENDMAIL="/usr/sbin/sendmail -oem -oi"
 
 
 CHECKSDIR="$HOME/.mutt/sendmail-checks.d"
 SENDMAIL="/usr/sbin/sendmail -oem -oi"
 

-TMPFILE=$(tempfile -p mutt-sendmail -s .msg)
+TMPFILE=$(mktemp --tmpdir mutt-sendmail.XXXXXXXXXX.msg)

 settrap () { trap "$@" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15; }
 cleanup () { rm -f "$TMPFILE"; settrap -; }
 settrap cleanup
 settrap () { trap "$@" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15; }
 cleanup () { rm -f "$TMPFILE"; settrap -; }
 settrap cleanup

diff --git a/.mutt/sendmail-checks.d/ack-recipients b/.mutt/sendmail-checks.d/ack-recipients
index d341964f47fcc42d47056e7f89184f4076dad141..749b1d6d0fe9542fdbb9fc081a3efbfbd259f725 100755 (executable)
--- a/.mutt/sendmail-checks.d/ack-recipients
+++ b/.mutt/sendmail-checks.d/ack-recipients
@@ -43,7 +43,7 @@ done
 [ $ret -eq 0 ] || exit $ret
 
 # now remove the X-Acked header from the mail
 [ $ret -eq 0 ] || exit $ret
 
 # now remove the X-Acked header from the mail

-TMPFILE=$(tempfile -p mutt-sendmail -s .msg)
+TMPFILE=$(mktemp --tmpdir mutt-sendmail.XXXXXXXXXX.msg)

 settrap () { trap "$@" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15; }
 cleanup () { rm -f "$TMPFILE"; settrap -; }
 settrap cleanup
 settrap () { trap "$@" 0 1 2 3 4 5 6 7 8 10 11 12 13 14 15; }
 cleanup () { rm -f "$TMPFILE"; settrap -; }
 settrap cleanup

diff --git a/.mutt/sendmail-checks.d/zzz_add-spool-bcc b/.mutt/sendmail-checks.d/zzz_add-spool-bcc
index f9f7cbf0fc0c0df791bf3e913b77f31c36dcab99..d0856797102bd8151602d07111d2df5c14351de7 100755 (executable)
--- a/.mutt/sendmail-checks.d/zzz_add-spool-bcc
+++ b/.mutt/sendmail-checks.d/zzz_add-spool-bcc
@@ -15,7 +15,7 @@ DEST="$SPOOL_MAILDIR/cur/${INPUT##*/}:2,S"
 
 if ! cp -n "$INPUT" "$DEST"; then
   echo >&1 "W: failed to spool message file '$1'."
 
 if ! cp -n "$INPUT" "$DEST"; then
   echo >&1 "W: failed to spool message file '$1'."

-  TMPFILE=$(tempfile -p mutt-sendmail -s .msg)
+  TMPFILE=$(mktemp --tmpdir mutt-sendmail.XXXXXXXXXX.msg)

   echo >&1 "W: leaving a copy in '$TMPFILE'…"
 else
   RECIPIENTS=$(for i in "$@"; do echo -n " $i,"; done)
   echo >&1 "W: leaving a copy in '$TMPFILE'…"
 else
   RECIPIENTS=$(for i in "$@"; do echo -n " $i,"; done)