Browse Source

Allow more than one rule per mailing list

Bob Mottram 9 years ago
parent
commit
df00b7e374
1 changed files with 7 additions and 5 deletions
  1. 7
    5
      src/freedombone-addlist

+ 7
- 5
src/freedombone-addlist View File

82
 shift
82
 shift
83
 done
83
 done
84
 
84
 
85
-if ! [[ $MYUSERNAME ]]; then
85
+if [ ! $MYUSERNAME ]; then
86
     show_help
86
     show_help
87
 fi
87
 fi
88
+
88
 if [[ ! $MAILINGLIST && ! $SUBJECTTAG ]]; then
89
 if [[ ! $MAILINGLIST && ! $SUBJECTTAG ]]; then
89
     show_help
90
     show_help
90
 fi
91
 fi
93
 PM=/home/$MYUSERNAME/.procmailrc
94
 PM=/home/$MYUSERNAME/.procmailrc
94
 LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST
95
 LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST
95
 
96
 
96
-# Exit if the list was already added
97
 if grep -q "=$MAILINGLIST" $MUTTRC; then
97
 if grep -q "=$MAILINGLIST" $MUTTRC; then
98
-    exit 54678
98
+    echo $"Mailing list $MAILINGLIST was already added"
99
 fi
99
 fi
100
 
100
 
101
 if [ ! -d "$LISTDIR" ]; then
101
 if [ ! -d "$LISTDIR" ]; then
155
 
155
 
156
 MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
156
 MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
157
 if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then
157
 if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then
158
-    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC
159
-    chown $MYUSERNAME:$MYUSERNAME $MUTTRC
158
+    if ! grep -q "=$MAILINGLIST" $MUTTRC; then
159
+        sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC
160
+        chown $MYUSERNAME:$MYUSERNAME $MUTTRC
161
+    fi
160
 fi
162
 fi
161
 
163
 
162
 if [ $LIST_ADDRESS ]; then
164
 if [ $LIST_ADDRESS ]; then