Browse Source

Wildcards

Bob Mottram 10 years ago
parent
commit
49a1c7bdc5
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      src/freedombone-addemail
  2. 1
    1
      src/freedombone-ignore

+ 2
- 2
src/freedombone-addemail View File

82
     mkdir -m 700 $LISTDIR/cur
82
     mkdir -m 700 $LISTDIR/cur
83
 fi
83
 fi
84
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
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
     echo "# Email rule for $EMAILADDRESS -> $MAILINGLIST" >> $PM
86
     echo "# Email rule for $EMAILADDRESS -> $MAILINGLIST" >> $PM
87
     echo ":0" >> $PM
87
     echo ":0" >> $PM
88
-    echo "  * ^From: $EMAILADDRESS" >> $PM
88
+    echo "  * ^From:.*$EMAILADDRESS" >> $PM
89
     echo "$LISTDIR/new" >> $PM
89
     echo "$LISTDIR/new" >> $PM
90
     echo "# End of rule" >> $PM
90
     echo "# End of rule" >> $PM
91
     chown $MYUSERNAME:$MYUSERNAME $PM
91
     chown $MYUSERNAME:$MYUSERNAME $PM

+ 1
- 1
src/freedombone-ignore View File

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