Quellcode durchsuchen

Only add rules if they don't already exist

Bob Mottram vor 10 Jahren
Ursprung
Commit
8d1240017b
2 geänderte Dateien mit 8 neuen und 6 gelöschten Zeilen
  1. 7
    5
      src/freedombone-addemail
  2. 1
    1
      src/freedombone-addlist

+ 7
- 5
src/freedombone-addemail Datei anzeigen

73
     mkdir -m 700 $LISTDIR/cur
73
     mkdir -m 700 $LISTDIR/cur
74
 fi
74
 fi
75
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
75
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
76
-echo "" >> $PM
77
-echo ":0" >> $PM
78
-echo "  * ^From: $EMAILADDRESS" >> $PM
79
-echo "$LISTDIR/new" >> $PM
80
-chown $MYUSERNAME:$MYUSERNAME $PM
76
+if ! grep -q "From: $EMAILADDRESS" $PM; then
77
+    echo "" >> $PM
78
+    echo ":0" >> $PM
79
+    echo "  * ^From: $EMAILADDRESS" >> $PM
80
+    echo "$LISTDIR/new" >> $PM
81
+    chown $MYUSERNAME:$MYUSERNAME $PM
82
+fi
81
 if [ ! -f "$MUTTRC" ]; then
83
 if [ ! -f "$MUTTRC" ]; then
82
   cp /etc/Muttrc $MUTTRC
84
   cp /etc/Muttrc $MUTTRC
83
   chown $MYUSERNAME:$MYUSERNAME $MUTTRC
85
   chown $MYUSERNAME:$MYUSERNAME $MUTTRC

+ 1
- 1
src/freedombone-addlist Datei anzeigen

79
 fi
79
 fi
80
 
80
 
81
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
81
 chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
82
-if ! grep -q "$LISTDIR/new" $PM; then
82
+if ! grep -q "Subject:.*()\[$SUBJECTTAG\]" $PM; then
83
     echo "" >> $PM
83
     echo "" >> $PM
84
     echo ":0" >> $PM
84
     echo ":0" >> $PM
85
     echo "  * ^Subject:.*()\[$SUBJECTTAG\]" >> $PM
85
     echo "  * ^Subject:.*()\[$SUBJECTTAG\]" >> $PM