]> git.madduck.net Git - etc/mutt.git/commitdiff

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:

improve attachment check
authormartin f. krafft <madduck@madduck.net>
Thu, 8 May 2014 07:07:35 +0000 (09:07 +0200)
committermartin f. krafft <madduck@madduck.net>
Thu, 8 May 2014 07:07:35 +0000 (09:07 +0200)
.mutt/sendmail-checks.d/check-attachments

index 8f01f85c05a43ceae65d6cdedd7b2dd5e9ee1865..6ecbb244b4feb6a3bc0c0aa56797a9d4be6cd650 100755 (executable)
@@ -21,7 +21,7 @@ RE_FRENCH='attach(e|er|(é|=E9|=C3=A9)e?s?|ement|ant)'
 OVERRIDE_HEADER=X-No-Attach
 
 if ! grep -qi "^${OVERRIDE_HEADER}:" "$1" \
 OVERRIDE_HEADER=X-No-Attach
 
 if ! grep -qi "^${OVERRIDE_HEADER}:" "$1" \
-     && grep -v '^> ' "$1" | egrep -ziq "($RE_ENGLISH|$RE_GERMAN|$RE_FRENCH)"; then
+    && egrep -v '^(> |Content-Disposition:)' "$1" | egrep -zi "($RE_ENGLISH|$RE_GERMAN|$RE_FRENCH)"; then
 
   nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//pi' "$1" |
               egrep -civ '^(multipart/|application/pgp-signature)')
 
   nr_attach=$(sed -rne 's/^Content-Type:[[:space:]]+//pi' "$1" |
               egrep -civ '^(multipart/|application/pgp-signature)')