|
|
@@ -31,11 +31,11 @@
|
|
31
|
31
|
|
|
32
|
32
|
MYUSERNAME=$USER
|
|
33
|
33
|
EMAILADDRESS=
|
|
34
|
|
-MAILINGLIST=
|
|
|
34
|
+GROUP_NAME=
|
|
35
|
35
|
|
|
36
|
36
|
function show_help {
|
|
37
|
37
|
echo ''
|
|
38
|
|
- echo 'freedombone-addemail -u [username] -e [email address] -l [mailing list name]'
|
|
|
38
|
+ echo 'freedombone-addemail -u [username] -e [email address] -g [group name]'
|
|
39
|
39
|
echo ''
|
|
40
|
40
|
exit 0
|
|
41
|
41
|
}
|
|
|
@@ -56,9 +56,9 @@ case $key in
|
|
56
|
56
|
shift
|
|
57
|
57
|
EMAILADDRESS="$1"
|
|
58
|
58
|
;;
|
|
59
|
|
- -l|--list)
|
|
|
59
|
+ -g|--group)
|
|
60
|
60
|
shift
|
|
61
|
|
- MAILINGLIST="$1"
|
|
|
61
|
+ GROUP_NAME="$1"
|
|
62
|
62
|
;;
|
|
63
|
63
|
*)
|
|
64
|
64
|
# unknown option
|
|
|
@@ -67,13 +67,13 @@ esac
|
|
67
|
67
|
shift
|
|
68
|
68
|
done
|
|
69
|
69
|
|
|
70
|
|
-if ! [[ $MYUSERNAME && $EMAILADDRESS && $MAILINGLIST ]]; then
|
|
|
70
|
+if ! [[ $MYUSERNAME && $EMAILADDRESS && $GROUP_NAME ]]; then
|
|
71
|
71
|
show_help
|
|
72
|
72
|
fi
|
|
73
|
73
|
|
|
74
|
74
|
MUTTRC=/home/$MYUSERNAME/.muttrc
|
|
75
|
75
|
PM=/home/$MYUSERNAME/.procmailrc
|
|
76
|
|
-LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST
|
|
|
76
|
+LISTDIR=/home/$MYUSERNAME/Maildir/$GROUP_NAME
|
|
77
|
77
|
|
|
78
|
78
|
if [ ! -d "$LISTDIR" ]; then
|
|
79
|
79
|
mkdir -m 700 $LISTDIR
|
|
|
@@ -82,8 +82,8 @@ if [ ! -d "$LISTDIR" ]; then
|
|
82
|
82
|
mkdir -m 700 $LISTDIR/cur
|
|
83
|
83
|
fi
|
|
84
|
84
|
chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR
|
|
85
|
|
-if ! grep -q "Email rule for $EMAILADDRESS -> $MAILINGLIST" $PM; then
|
|
86
|
|
- echo "# Email rule for $EMAILADDRESS -> $MAILINGLIST" >> $PM
|
|
|
85
|
+if ! grep -q "Email rule for $EMAILADDRESS -> $GROUP_NAME" $PM; then
|
|
|
86
|
+ echo "# Email rule for $EMAILADDRESS -> $GROUP_NAME" >> $PM
|
|
87
|
87
|
echo ":0" >> $PM
|
|
88
|
88
|
echo " * ^From:.*$EMAILADDRESS" >> $PM
|
|
89
|
89
|
echo "$LISTDIR/new" >> $PM
|
|
|
@@ -100,9 +100,9 @@ if [ ! -d $PROCMAILLOG ]; then
|
|
100
|
100
|
chown -R $MYUSERNAME:$MYUSERNAME $PROCMAILLOG
|
|
101
|
101
|
fi
|
|
102
|
102
|
MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)
|
|
103
|
|
-if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then
|
|
104
|
|
- if ! grep -q "=$MAILINGLIST" $MUTTRC; then
|
|
105
|
|
- sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC
|
|
|
103
|
+if [[ $MUTT_MAILBOXES != *$GROUP_NAME* ]]; then
|
|
|
104
|
+ if ! grep -q "=$GROUP_NAME" $MUTTRC; then
|
|
|
105
|
+ sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$GROUP_NAME|g" $MUTTRC
|
|
106
|
106
|
chown $MYUSERNAME:$MYUSERNAME $MUTTRC
|
|
107
|
107
|
fi
|
|
108
|
108
|
fi
|
Bob Mottram
10 lat temu