improve trapping and cleanup in sendmail wrapper

[etc/mutt.git] / .mutt / sendmail

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 44e91dc3241eee8d48358efed7b2cebd8f655cc5..27458142c7505f677b009fa134dea466e9e46247 100755 (executable)
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -16,8 +16,9 @@ CHECKSDIR="$HOME/.mutt/sendmail-checks.d"
 SENDMAIL="/usr/sbin/sendmail -oem -oi"
 
 TMPFILE=$(tempfile -p mutt-sendmail -s .msg)
 SENDMAIL="/usr/sbin/sendmail -oem -oi"
 
 TMPFILE=$(tempfile -p mutt-sendmail -s .msg)

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

 
 cat > $TMPFILE
 args=$(for a in $@; do [ $a = -- ] || echo "--arg=$a"; done)
 
 cat > $TMPFILE
 args=$(for a in $@; do [ $a = -- ] || echo "--arg=$a"; done)