From cd5291851b41c380dacecf41a813dba153fcf42d Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Thu, 11 Feb 2016 11:48:30 +0000
Subject: [PATCH] Keep email encryption as the final step in procmail

---
 src/freedombone-addlist | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/freedombone-addlist b/src/freedombone-addlist
index 5ffbd334..85b2fb34 100755
--- a/src/freedombone-addlist
+++ b/src/freedombone-addlist
@@ -101,22 +101,19 @@ chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
 
 if ! grep -q "Subject:.*()\[$SUBJECTTAG\]" $PM; then
     if ! grep -q "\# encrypt" $PM; then
-        echo "" >> $PM
-        echo "/# Email rule for $MAILINGLIST subject \[$SUBJECTTAG\]" >> $PM
-        echo ":0" >> $PM
-        echo "  * ^Subject:.*()\[$SUBJECTTAG\]" >> $PM
-        echo "$LISTDIR/new" >> $PM
-        echo "/# End of rule" >> $PM
-        chown $MYUSERNAME:$MYUSERNAME $PM
-    else
-        sed -i "/\# encrypt/i
-/# Email rule for $MAILINGLIST subject \[$SUBJECTTAG\]
+        filter="
+# Email rule for $MAILINGLIST subject [$SUBJECTTAG]
 :0
   * ^Subject:.*()\[$SUBJECTTAG\]
 $LISTDIR/new
-/# End of rule
-" $PM
+# End of rule
+"
+        echo "$filter" >> $PM
+    else
+        filter=$(echo "# Email rule for $MAILINGLIST subject [$SUBJECTTAG]\n:0\n  * ^Subject:.*()\\\[$SUBJECTTAG\\\]\n$LISTDIR/new\n# End of rule\n")
+        sed "/# encrypt/i ${filter}" $PM
     fi
+    chown $MYUSERNAME:$MYUSERNAME $PM
 fi
 
 if [ ! -f "$MUTTRC" ]; then