|
@@ -88,11 +88,16 @@ if [ ! -d "$LISTDIR" ]; then
|
88
|
88
|
fi
|
89
|
89
|
chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
|
90
|
90
|
if ! grep -q "Email rule for $EMAILADDRESS -> $GROUP_NAME" $PM; then
|
91
|
|
- echo "# Email rule for $EMAILADDRESS -> $GROUP_NAME" >> $PM
|
92
|
|
- echo ":0" >> $PM
|
93
|
|
- echo " * ^From:.*$EMAILADDRESS" >> $PM
|
94
|
|
- echo "$LISTDIR/new" >> $PM
|
95
|
|
- echo "# End of rule" >> $PM
|
|
91
|
+ if ! grep -q "\# encrypt" $PM; then
|
|
92
|
+ echo "# Email rule for $EMAILADDRESS -> $GROUP_NAME" >> $PM
|
|
93
|
+ echo ":0" >> $PM
|
|
94
|
+ echo " * ^From:.*$EMAILADDRESS" >> $PM
|
|
95
|
+ echo "$LISTDIR/new" >> $PM
|
|
96
|
+ echo "# End of rule" >> $PM
|
|
97
|
+ else
|
|
98
|
+ filter=$(echo "# Email rule for $EMAILADDRESS -> $GROUP_NAME\n:0\n * ^From:.*$EMAILADDRESS\n$LISTDIR/new\n# End of rule\n")
|
|
99
|
+ sed "/# encrypt/i ${filter}" $PM
|
|
100
|
+ fi
|
96
|
101
|
chown $MYUSERNAME:$MYUSERNAME $PM
|
97
|
102
|
fi
|
98
|
103
|
if [ ! -f "$MUTTRC" ]; then
|