X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/9d999ee7bf4b33f345d839a8a165c776dcc9dfb6..f1ab8bcb3d0102fe44d2baad1de229f3edce4048:/.mutt/sendmail

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 48b5e63..80fd4a1 100755
--- 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
 #
-set -eu
+set -eux
 
 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
@@ -31,9 +31,19 @@ for i in "$@"; do
 done
 
 cat > $TMPFILE
-recipients="$recipients $(formail -czx X-Bcc-Spool: < "$TMPFILE" | tr -d ',')"
+
+remove_headers=
+if ! formail -czx "Resent-" < "$TMPFILE" | grep -q .; then
+  # only do this for original mails, not bounces
+  recipients="$recipients $(formail -czx "X-Bcc" < "$TMPFILE" | tr -d ',')"
+  remove_headers="$remove_headers -IX-Bcc"
+fi
 args=$(for i in $recipients; do echo "--arg=$i"; done)
-run-parts --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
-formail -I X-Spool-Bcc: < "$TMPFILE" | eval $SENDMAIL "$sendmail_args" -- "$recipients"
+run-parts --exit-on-error --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR"
+
+recipients=$(echo "$recipients" | xargs)
+
+formail $remove_headers < "$TMPFILE" \
+  | eval $SENDMAIL "$sendmail_args" -- "$recipients"
 
 cleanup