]> git.madduck.net Git - etc/mutt.git/blobdiff - .mutt/sendmail-checks.d/check-attachments

madduck's git repository

Every one of the projects in this repository is available at the canonical URL git://git.madduck.net/madduck/pub/<projectpath> — see each project's metadata for the exact URL.

All patches and comments are welcome. Please squash your changes to logical commits before using git-format-patch and git-send-email to patches@git.madduck.net. If you'd read over the Git project's submission guidelines and adhered to them, I'd be especially grateful.

SSH access, as well as push access can be individually arranged.

If you use my repositories frequently, consider adding the following snippet to ~/.gitconfig and using the third clone URL listed for each project:

[url "git://git.madduck.net/madduck/"]
  insteadOf = madduck:

add linux-thinkpad list
[etc/mutt.git] / .mutt / sendmail-checks.d / check-attachments
index 0573bf918a2491f1eb7aea9f440a634e4b277c04..5632f2ea863e5cd0d54f11f5144a89f7feb129df 100755 (executable)
@@ -18,16 +18,16 @@ 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)'
 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" \
+     && grep -v '^> ' "$1" | egrep -ziq "($RE_ENGLISH|$RE_GERMAN|$RE_FRENCH)"; then
 
   nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//p' "$1" |
               egrep -cv '^(multipart/|application/pgp-signature)')
 
   if [ $nr_attach -lt 2 ]; then
 
   nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//p' "$1" |
               egrep -cv '^(multipart/|application/pgp-signature)')
 
   if [ $nr_attach -lt 2 ]; then
-    echo >&2 "E: the mail message references an attachment,"
+    echo >&2 "E: the mail message likely references an attachment,"
     echo >&2 "E: but there seems to be no non-PGP MIME part."
     echo >&2 "E: (add the $OVERRIDE_HEADER header to override the check)."
     exit 1
     echo >&2 "E: but there seems to be no non-PGP MIME part."
     echo >&2 "E: (add the $OVERRIDE_HEADER header to override the check)."
     exit 1