X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/02e4a0894209d2d9b2b3f81cd85a6dcfcf03ed40..3803d2cf1b594cc4d5001dea7a3c5b9dafaf0a2a:/.mutt/sendmail diff --git a/.mutt/sendmail b/.mutt/sendmail index 132a417..881935d 100755 --- a/.mutt/sendmail +++ b/.mutt/sendmail @@ -31,9 +31,17 @@ 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-Bcc-Spool: < "$TMPFILE" | eval $SENDMAIL "$sendmail_args" -- "$recipients" +run-parts --exit-on-error --umask=0077 --arg="$TMPFILE" $args -- "$CHECKSDIR" + +formail $remove_headers < "$TMPFILE" \ + | eval $SENDMAIL "$sendmail_args" -- "$recipients" cleanup