Bläddra i källkod

Only change mutt mailboxes if the string isn't already present

Bob Mottram 10 år sedan
förälder
incheckning
b216eef354
1 ändrade filer med 9 tillägg och 5 borttagningar
  1. 9
    5
      install-freedombone.sh

+ 9
- 5
install-freedombone.sh Visa fil

1189
   echo '  chown -R $MYUSERNAME:$MYUSERNAME $PROCMAILLOG' >> /usr/bin/mailinglistrule
1189
   echo '  chown -R $MYUSERNAME:$MYUSERNAME $PROCMAILLOG' >> /usr/bin/mailinglistrule
1190
   echo 'fi' >> /usr/bin/mailinglistrule
1190
   echo 'fi' >> /usr/bin/mailinglistrule
1191
   echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/mailinglistrule
1191
   echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/mailinglistrule
1192
-  echo 'sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/mailinglistrule
1193
-  echo 'chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/mailinglistrule
1192
+  echo 'if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then' >> /usr/bin/mailinglistrule
1193
+  echo '  sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/mailinglistrule
1194
+  echo '  chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/mailinglistrule
1195
+  echo 'fi' >> /usr/bin/mailinglistrule
1194
   chmod +x /usr/bin/mailinglistrule
1196
   chmod +x /usr/bin/mailinglistrule
1195
   echo 'folders_for_mailing_lists' >> $COMPLETION_FILE
1197
   echo 'folders_for_mailing_lists' >> $COMPLETION_FILE
1196
 }
1198
 }
1232
   echo '  chown -R $MYUSERNAME:$MYUSERNAME $PROCMAILLOG' >> /usr/bin/emailrule
1234
   echo '  chown -R $MYUSERNAME:$MYUSERNAME $PROCMAILLOG' >> /usr/bin/emailrule
1233
   echo 'fi' >> /usr/bin/emailrule
1235
   echo 'fi' >> /usr/bin/emailrule
1234
   echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/emailrule
1236
   echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/emailrule
1235
-  echo 'sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/emailrule
1236
-  echo 'chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/emailrule
1237
+  echo 'if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then' >> /usr/bin/emailrule
1238
+  echo '  sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/emailrule
1239
+  echo '  chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/emailrule
1240
+  echo 'fi' >> /usr/bin/emailrule
1237
   chmod +x /usr/bin/emailrule
1241
   chmod +x /usr/bin/emailrule
1238
   echo 'folders_for_email_addresses' >> $COMPLETION_FILE
1242
   echo 'folders_for_email_addresses' >> $COMPLETION_FILE
1239
 }
1243
 }
1307
   useradd -d /var/schleuderlists -s /bin/false schleuder
1311
   useradd -d /var/schleuderlists -s /bin/false schleuder
1308
   adduser Debian-exim schleuder
1312
   adduser Debian-exim schleuder
1309
   usermod -a -G mail schleuder
1313
   usermod -a -G mail schleuder
1310
-  exim -d -bt $PRIVATE_MAILING_LIST@$DOMAIN_NAME
1314
+  #exim -d -bt $PRIVATE_MAILING_LIST@$DOMAIN_NAME
1311
   echo 'create_private_mailing_list' >> $COMPLETION_FILE
1315
   echo 'create_private_mailing_list' >> $COMPLETION_FILE
1312
 }
1316
 }
1313
 
1317