better overriding with x-draft

[etc/mutt.git] / .mutt / sendmail-checks.d / prevent-draft

diff --git a/.mutt/sendmail-checks.d/prevent-draft b/.mutt/sendmail-checks.d/prevent-draft
index 00d7011c75fcc1e5df368e560ace331ac5a11952..a775a386ed450383af72022eda90a7ada083f9a1 100755 (executable)
--- 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
 #
 # 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: 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
   exit 1
 fi

-
-set +x