Преглед на файлове

Avoid duplicates when adding emails to folders

Bob Mottram преди 10 години
родител
ревизия
a2aac02a09
променени са 1 файла, в които са добавени 8 реда и са изтрити 3 реда
  1. 8
    3
      install-freedombone.sh

+ 8
- 3
install-freedombone.sh Целия файл

1571
   echo 'LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST' >> /usr/bin/mailinglistrule
1571
   echo 'LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST' >> /usr/bin/mailinglistrule
1572
   echo '' >> /usr/bin/mailinglistrule
1572
   echo '' >> /usr/bin/mailinglistrule
1573
   echo '# Exit if the list was already added' >> /usr/bin/mailinglistrule
1573
   echo '# Exit if the list was already added' >> /usr/bin/mailinglistrule
1574
-  echo 'if grep -Fxq "=$MAILINGLIST" $MUTTRC; then' >> /usr/bin/mailinglistrule
1574
+  echo 'if grep -q "=$MAILINGLIST" $MUTTRC; then' >> /usr/bin/mailinglistrule
1575
   echo '  exit 1' >> /usr/bin/mailinglistrule
1575
   echo '  exit 1' >> /usr/bin/mailinglistrule
1576
   echo 'fi' >> /usr/bin/mailinglistrule
1576
   echo 'fi' >> /usr/bin/mailinglistrule
1577
   echo '' >> /usr/bin/mailinglistrule
1577
   echo '' >> /usr/bin/mailinglistrule
1629
   echo 'MUTTRC=/home/$MYUSERNAME/.muttrc' >> /usr/bin/emailrule
1629
   echo 'MUTTRC=/home/$MYUSERNAME/.muttrc' >> /usr/bin/emailrule
1630
   echo 'PM=/home/$MYUSERNAME/.procmailrc' >> /usr/bin/emailrule
1630
   echo 'PM=/home/$MYUSERNAME/.procmailrc' >> /usr/bin/emailrule
1631
   echo 'LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST' >> /usr/bin/emailrule
1631
   echo 'LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST' >> /usr/bin/emailrule
1632
+  echo '' >> /usr/bin/emailrule
1632
   echo 'if ! [[ $MYUSERNAME && $EMAILADDRESS && $MAILINGLIST ]]; then' >> /usr/bin/emailrule
1633
   echo 'if ! [[ $MYUSERNAME && $EMAILADDRESS && $MAILINGLIST ]]; then' >> /usr/bin/emailrule
1633
   echo '  echo "emailrule [user name] [email address] [mailing list name]"' >> /usr/bin/emailrule
1634
   echo '  echo "emailrule [user name] [email address] [mailing list name]"' >> /usr/bin/emailrule
1634
   echo '  exit 1' >> /usr/bin/emailrule
1635
   echo '  exit 1' >> /usr/bin/emailrule
1635
   echo 'fi' >> /usr/bin/emailrule
1636
   echo 'fi' >> /usr/bin/emailrule
1637
+  echo '' >> /usr/bin/emailrule
1636
   echo 'if [ ! -d "$LISTDIR" ]; then' >> /usr/bin/emailrule
1638
   echo 'if [ ! -d "$LISTDIR" ]; then' >> /usr/bin/emailrule
1637
   echo '  mkdir -m 700 $LISTDIR' >> /usr/bin/emailrule
1639
   echo '  mkdir -m 700 $LISTDIR' >> /usr/bin/emailrule
1638
   echo '  mkdir -m 700 $LISTDIR/tmp' >> /usr/bin/emailrule
1640
   echo '  mkdir -m 700 $LISTDIR/tmp' >> /usr/bin/emailrule
1656
   echo 'fi' >> /usr/bin/emailrule
1658
   echo 'fi' >> /usr/bin/emailrule
1657
   echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/emailrule
1659
   echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/emailrule
1658
   echo 'if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then' >> /usr/bin/emailrule
1660
   echo 'if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then' >> /usr/bin/emailrule
1659
-  echo '  sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/emailrule
1660
-  echo '  chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/emailrule
1661
+  echo '  if ! grep -q "=$MAILINGLIST" $MUTTRC; then' >> /usr/bin/emailrule
1662
+  echo '    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/emailrule
1663
+  echo '    chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/emailrule
1664
+  echo '  fi' >> /usr/bin/emailrule
1661
   echo 'fi' >> /usr/bin/emailrule
1665
   echo 'fi' >> /usr/bin/emailrule
1666
+  echo 'exit 0' >> /usr/bin/emailrule
1662
   chmod +x /usr/bin/emailrule
1667
   chmod +x /usr/bin/emailrule
1663
   echo 'folders_for_email_addresses' >> $COMPLETION_FILE
1668
   echo 'folders_for_email_addresses' >> $COMPLETION_FILE
1664
 }
1669
 }