fix word-boundary message matching for attribution hook

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

diff --git a/.mutt/sendmail b/.mutt/sendmail
index 48b5e6355b73cb388e64bb9617910ee41f8ca807..b125941554d8dace86a6ee509e7fc8b439dad253 100755 (executable)
--- a/.mutt/sendmail
+++ b/.mutt/sendmail
@@ -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