improve attachment check

[etc/mutt.git] / .mutt / sendmail-checks.d / check-attachments

diff --git a/.mutt/sendmail-checks.d/check-attachments b/.mutt/sendmail-checks.d/check-attachments
index 8f08f35c1ffddeb11fb91fb6fe381ff908c50b51..6ecbb244b4feb6a3bc0c0aa56797a9d4be6cd650 100755 (executable)
--- a/.mutt/sendmail-checks.d/check-attachments
+++ b/.mutt/sendmail-checks.d/check-attachments
@@ -18,13 +18,13 @@ set -eu
 RE_ENGLISH='attach(ing|ed|ment)?|included\W+(with|in)\W+th(is|e\W+(curr|pres)ent)\W+mail'
 RE_GERMAN='an(geh(ä|=E4|=C3=A4)ngt|h(ä|=E4|=C3=A4)ngsel|bei)|bei(gef(ü|=FC|=C3=BC)gt|lage)|(im|siehe)\W+(anhang|beilage)'
 RE_FRENCH='attach(e|er|(é|=E9|=C3=A9)e?s?|ement|ant)'
-OVERRIDE_HEADER=X-No-Attachments
+OVERRIDE_HEADER=X-No-Attach
 
-if ! grep -q "^${OVERRIDE_HEADER}:" "$1" \
-     && egrep -ziq "($RE_ENGLISH|$RE_GERMAN|$RE_FRENCH)" "$1"; then
+if ! grep -qi "^${OVERRIDE_HEADER}:" "$1" \
+    && egrep -v '^(> |Content-Disposition:)' "$1" | egrep -zi "($RE_ENGLISH|$RE_GERMAN|$RE_FRENCH)"; then
 
-  nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//p' "$1" |
-              egrep -cv '^(multipart/|application/pgp-signature)')
+  nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//pi' "$1" |
+              egrep -civ '^(multipart/|application/pgp-signature)')
 
   if [ $nr_attach -lt 2 ]; then
     echo >&2 "E: the mail message likely references an attachment,"