浏览代码

Only add rules if they don't already exist

Bob Mottram 10 年前
父节点
当前提交
8d1240017b
共有 2 个文件被更改,包括 8 次插入6 次删除
  1. 7
    5
      src/freedombone-addemail
  2. 1
    1
      src/freedombone-addlist

+ 7
- 5
src/freedombone-addemail 查看文件

@@ -73,11 +73,13 @@ if [ ! -d "$LISTDIR" ]; then
73 73
     mkdir -m 700 $LISTDIR/cur
74 74
 fi
75 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 83
 if [ ! -f "$MUTTRC" ]; then
82 84
   cp /etc/Muttrc $MUTTRC
83 85
   chown $MYUSERNAME:$MYUSERNAME $MUTTRC

+ 1
- 1
src/freedombone-addlist 查看文件

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