|
@@ -82,9 +82,10 @@ esac
|
82
|
82
|
shift
|
83
|
83
|
done
|
84
|
84
|
|
85
|
|
-if ! [[ $MYUSERNAME ]]; then
|
|
85
|
+if [ ! $MYUSERNAME ]; then
|
86
|
86
|
show_help
|
87
|
87
|
fi
|
|
88
|
+
|
88
|
89
|
if [[ ! $MAILINGLIST && ! $SUBJECTTAG ]]; then
|
89
|
90
|
show_help
|
90
|
91
|
fi
|
|
@@ -93,9 +94,8 @@ MUTTRC=/home/$MYUSERNAME/.muttrc
|
93
|
94
|
PM=/home/$MYUSERNAME/.procmailrc
|
94
|
95
|
LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST
|
95
|
96
|
|
96
|
|
-# Exit if the list was already added
|
97
|
97
|
if grep -q "=$MAILINGLIST" $MUTTRC; then
|
98
|
|
- exit 54678
|
|
98
|
+ echo $"Mailing list $MAILINGLIST was already added"
|
99
|
99
|
fi
|
100
|
100
|
|
101
|
101
|
if [ ! -d "$LISTDIR" ]; then
|
|
@@ -155,8 +155,10 @@ fi
|
155
|
155
|
|
156
|
156
|
MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
|
157
|
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
|
162
|
fi
|
161
|
163
|
|
162
|
164
|
if [ $LIST_ADDRESS ]; then
|