]> 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:

fix attachment check
[etc/mutt.git] / .mutt / sendmail-checks.d / check-attachments
index 8f08f35c1ffddeb11fb91fb6fe381ff908c50b51..e8e5b7cecb7128d0f8c514e34ba68567e0df917d 100755 (executable)
@@ -18,10 +18,10 @@ 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)" "$1"; 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:]]+//p' "$1" |
               egrep -cv '^(multipart/|application/pgp-signature)')