X-Git-Url: https://git.madduck.net/etc/mutt.git/blobdiff_plain/a121d7ed86896eb799d82b77e3d806bcb153205b..ff90937db28487ad9228eed5357565d2fcc3986e:/.mutt/sendmail-checks.d/prevent-draft

diff --git a/.mutt/sendmail-checks.d/prevent-draft b/.mutt/sendmail-checks.d/prevent-draft
index 00d7011..a775a38 100755
--- a/.mutt/sendmail-checks.d/prevent-draft
+++ b/.mutt/sendmail-checks.d/prevent-draft
@@ -5,15 +5,13 @@
 # Copyright © 2010 martin f. krafft <madduck@madduck.net>
 # Released under the terms of the Artistic Licence 2.0
 #
-set -eux
-exec 2>&1
+set -eu
 
-draft_headers=$(sed -ne '1,/^$/p' "$1" | egrep -i '^(X-Draft:|Subject:.*[[(]?(Draft|Entwurf)[])]?)' || :)
+draft_headers=$(sed -ne '1,/^$/p' "$1" | egrep -i '^(X-Draft:|Subject:.*[[(]?(Draft|Entwurf)[])]?|(To|Cc):.*[-_]DRAFT)' || :)
 
-if [ -n "$draft_headers" ] && ! echo "$draft_headers" | egrep -viq '^X-Draft: (ok|no)'; then
+if [ -n "$draft_headers" ]; then
+  echo "$draft_headers" | egrep -iq '^X-Draft: (ok|no)' && exit 0
   echo >&2 "E: will not send this message while the X-Draft header or"
-  echo >&2 "E: a subject draft tag is present."
+  echo >&2 "E: a subject or receipient draft tag is present."
   exit 1
 fi
-
-set +x