Selaa lähdekoodia

Keep email encryption as the final step in procmail

Bob Mottram 9 vuotta sitten
vanhempi
commit
cd5291851b
1 muutettua tiedostoa jossa 9 lisäystä ja 12 poistoa
  1. 9
    12
      src/freedombone-addlist

+ 9
- 12
src/freedombone-addlist Näytä tiedosto

@@ -101,22 +101,19 @@ chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
101 101
 
102 102
 if ! grep -q "Subject:.*()\[$SUBJECTTAG\]" $PM; then
103 103
     if ! grep -q "\# encrypt" $PM; then
104
-        echo "" >> $PM
105
-        echo "/# Email rule for $MAILINGLIST subject \[$SUBJECTTAG\]" >> $PM
106
-        echo ":0" >> $PM
107
-        echo "  * ^Subject:.*()\[$SUBJECTTAG\]" >> $PM
108
-        echo "$LISTDIR/new" >> $PM
109
-        echo "/# End of rule" >> $PM
110
-        chown $MYUSERNAME:$MYUSERNAME $PM
111
-    else
112
-        sed -i "/\# encrypt/i
113
-/# Email rule for $MAILINGLIST subject \[$SUBJECTTAG\]
104
+        filter="
105
+# Email rule for $MAILINGLIST subject [$SUBJECTTAG]
114 106
 :0
115 107
   * ^Subject:.*()\[$SUBJECTTAG\]
116 108
 $LISTDIR/new
117
-/# End of rule
118
-" $PM
109
+# End of rule
110
+"
111
+        echo "$filter" >> $PM
112
+    else
113
+        filter=$(echo "# Email rule for $MAILINGLIST subject [$SUBJECTTAG]\n:0\n  * ^Subject:.*()\\\[$SUBJECTTAG\\\]\n$LISTDIR/new\n# End of rule\n")
114
+        sed "/# encrypt/i ${filter}" $PM
119 115
     fi
116
+    chown $MYUSERNAME:$MYUSERNAME $PM
120 117
 fi
121 118
 
122 119
 if [ ! -f "$MUTTRC" ]; then