Bob Mottram преди 10 години
родител
ревизия
49a1c7bdc5
променени са 2 файла, в които са добавени 3 реда и са изтрити 3 реда
  1. 2
    2
      src/freedombone-addemail
  2. 1
    1
      src/freedombone-ignore

+ 2
- 2
src/freedombone-addemail Целия файл

@@ -82,10 +82,10 @@ if [ ! -d "$LISTDIR" ]; then
82 82
     mkdir -m 700 $LISTDIR/cur
83 83
 fi
84 84
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
85
-if ! grep -q "From: $EMAILADDRESS" $PM; then
85
+if ! grep -q "Email rule for $EMAILADDRESS -> $MAILINGLIST" $PM; then
86 86
     echo "# Email rule for $EMAILADDRESS -> $MAILINGLIST" >> $PM
87 87
     echo ":0" >> $PM
88
-    echo "  * ^From: $EMAILADDRESS" >> $PM
88
+    echo "  * ^From:.*$EMAILADDRESS" >> $PM
89 89
     echo "$LISTDIR/new" >> $PM
90 90
     echo "# End of rule" >> $PM
91 91
     chown $MYUSERNAME:$MYUSERNAME $PM

+ 1
- 1
src/freedombone-ignore Целия файл

@@ -94,7 +94,7 @@ if [ $EMAIL_ADDRESS ]; then
94 94
     if ! grep -q "Ignore rule for $EMAIL_ADDRESS" $PM; then
95 95
         echo "# Ignore rule for $EMAIL_ADDRESS" >> $PM
96 96
         echo ":0" >> $PM
97
-        echo "  * ^From: $EMAIL_ADDRESS" >> $PM
97
+        echo "  * ^From:.*$EMAIL_ADDRESS" >> $PM
98 98
         echo "/dev/null" >> $PM
99 99
         echo "# End of ignore rule" >> $PM
100 100
         chown $MYUSERNAME:$MYUSERNAME $PM