Просмотр исходного кода

Change email rule script name to make it more intuitive

Bob Mottram 10 лет назад
Родитель
Сommit
22d0843319
1 измененных файлов: 44 добавлений и 44 удалений
  1. 44
    44
      install-freedombone.sh

+ 44
- 44
install-freedombone.sh Просмотреть файл

1692
   if grep -Fxq "folders_for_email_addresses" $COMPLETION_FILE; then
1692
   if grep -Fxq "folders_for_email_addresses" $COMPLETION_FILE; then
1693
       return
1693
       return
1694
   fi
1694
   fi
1695
-  echo '#!/bin/bash' > /usr/bin/emailrule
1696
-  echo 'MYUSERNAME=$1' >> /usr/bin/emailrule
1697
-  echo 'EMAILADDRESS=$2' >> /usr/bin/emailrule
1698
-  echo 'MAILINGLIST=$3' >> /usr/bin/emailrule
1699
-  echo 'MUTTRC=/home/$MYUSERNAME/.muttrc' >> /usr/bin/emailrule
1700
-  echo 'PM=/home/$MYUSERNAME/.procmailrc' >> /usr/bin/emailrule
1701
-  echo 'LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST' >> /usr/bin/emailrule
1702
-  echo '' >> /usr/bin/emailrule
1703
-  echo 'if ! [[ $MYUSERNAME && $EMAILADDRESS && $MAILINGLIST ]]; then' >> /usr/bin/emailrule
1704
-  echo '  echo "emailrule [user name] [email address] [mailing list name]"' >> /usr/bin/emailrule
1705
-  echo '  exit 1' >> /usr/bin/emailrule
1706
-  echo 'fi' >> /usr/bin/emailrule
1707
-  echo '' >> /usr/bin/emailrule
1708
-  echo 'if [ ! -d "$LISTDIR" ]; then' >> /usr/bin/emailrule
1709
-  echo '  mkdir -m 700 $LISTDIR' >> /usr/bin/emailrule
1710
-  echo '  mkdir -m 700 $LISTDIR/tmp' >> /usr/bin/emailrule
1711
-  echo '  mkdir -m 700 $LISTDIR/new' >> /usr/bin/emailrule
1712
-  echo '  mkdir -m 700 $LISTDIR/cur' >> /usr/bin/emailrule
1713
-  echo 'fi' >> /usr/bin/emailrule
1714
-  echo 'chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR' >> /usr/bin/emailrule
1715
-  echo 'echo "" >> $PM' >> /usr/bin/emailrule
1716
-  echo 'echo ":0" >> $PM' >> /usr/bin/emailrule
1717
-  echo 'echo "  * ^From: $EMAILADDRESS" >> $PM' >> /usr/bin/emailrule
1718
-  echo 'echo "$LISTDIR/new" >> $PM' >> /usr/bin/emailrule
1719
-  echo 'chown $MYUSERNAME:$MYUSERNAME $PM' >> /usr/bin/emailrule
1720
-  echo 'if [ ! -f "$MUTTRC" ]; then' >> /usr/bin/emailrule
1721
-  echo '  cp /etc/Muttrc $MUTTRC' >> /usr/bin/emailrule
1722
-  echo '  chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/emailrule
1723
-  echo 'fi' >> /usr/bin/emailrule
1724
-  echo 'PROCMAILLOG=/home/$MYUSERNAME/log' >> /usr/bin/emailrule
1725
-  echo 'if [ ! -d $PROCMAILLOG ]; then' >> /usr/bin/emailrule
1726
-  echo '  mkdir $PROCMAILLOG' >> /usr/bin/emailrule
1727
-  echo '  chown -R $MYUSERNAME:$MYUSERNAME $PROCMAILLOG' >> /usr/bin/emailrule
1728
-  echo 'fi' >> /usr/bin/emailrule
1729
-  echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/emailrule
1730
-  echo 'if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then' >> /usr/bin/emailrule
1731
-  echo '  if ! grep -q "=$MAILINGLIST" $MUTTRC; then' >> /usr/bin/emailrule
1732
-  echo '    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/emailrule
1733
-  echo '    chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/emailrule
1734
-  echo '  fi' >> /usr/bin/emailrule
1735
-  echo 'fi' >> /usr/bin/emailrule
1736
-  echo 'exit 0' >> /usr/bin/emailrule
1737
-  chmod +x /usr/bin/emailrule
1695
+  echo '#!/bin/bash' > /usr/bin/addemailtofolder
1696
+  echo 'MYUSERNAME=$1' >> /usr/bin/addemailtofolder
1697
+  echo 'EMAILADDRESS=$2' >> /usr/bin/addemailtofolder
1698
+  echo 'MAILINGLIST=$3' >> /usr/bin/addemailtofolder
1699
+  echo 'MUTTRC=/home/$MYUSERNAME/.muttrc' >> /usr/bin/addemailtofolder
1700
+  echo 'PM=/home/$MYUSERNAME/.procmailrc' >> /usr/bin/addemailtofolder
1701
+  echo 'LISTDIR=/home/$MYUSERNAME/Maildir/$MAILINGLIST' >> /usr/bin/addemailtofolder
1702
+  echo '' >> /usr/bin/addemailtofolder
1703
+  echo 'if ! [[ $MYUSERNAME && $EMAILADDRESS && $MAILINGLIST ]]; then' >> /usr/bin/addemailtofolder
1704
+  echo '  echo "addemailtofolder [user name] [email address] [mailing list name]"' >> /usr/bin/addemailtofolder
1705
+  echo '  exit 1' >> /usr/bin/addemailtofolder
1706
+  echo 'fi' >> /usr/bin/addemailtofolder
1707
+  echo '' >> /usr/bin/addemailtofolder
1708
+  echo 'if [ ! -d "$LISTDIR" ]; then' >> /usr/bin/addemailtofolder
1709
+  echo '  mkdir -m 700 $LISTDIR' >> /usr/bin/addemailtofolder
1710
+  echo '  mkdir -m 700 $LISTDIR/tmp' >> /usr/bin/addemailtofolder
1711
+  echo '  mkdir -m 700 $LISTDIR/new' >> /usr/bin/addemailtofolder
1712
+  echo '  mkdir -m 700 $LISTDIR/cur' >> /usr/bin/addemailtofolder
1713
+  echo 'fi' >> /usr/bin/addemailtofolder
1714
+  echo 'chown -R $MYUSERNAME:$MYUSERNAME $LISTDIR' >> /usr/bin/addemailtofolder
1715
+  echo 'echo "" >> $PM' >> /usr/bin/addemailtofolder
1716
+  echo 'echo ":0" >> $PM' >> /usr/bin/addemailtofolder
1717
+  echo 'echo "  * ^From: $EMAILADDRESS" >> $PM' >> /usr/bin/addemailtofolder
1718
+  echo 'echo "$LISTDIR/new" >> $PM' >> /usr/bin/addemailtofolder
1719
+  echo 'chown $MYUSERNAME:$MYUSERNAME $PM' >> /usr/bin/addemailtofolder
1720
+  echo 'if [ ! -f "$MUTTRC" ]; then' >> /usr/bin/addemailtofolder
1721
+  echo '  cp /etc/Muttrc $MUTTRC' >> /usr/bin/addemailtofolder
1722
+  echo '  chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/addemailtofolder
1723
+  echo 'fi' >> /usr/bin/addemailtofolder
1724
+  echo 'PROCMAILLOG=/home/$MYUSERNAME/log' >> /usr/bin/addemailtofolder
1725
+  echo 'if [ ! -d $PROCMAILLOG ]; then' >> /usr/bin/addemailtofolder
1726
+  echo '  mkdir $PROCMAILLOG' >> /usr/bin/addemailtofolder
1727
+  echo '  chown -R $MYUSERNAME:$MYUSERNAME $PROCMAILLOG' >> /usr/bin/addemailtofolder
1728
+  echo 'fi' >> /usr/bin/addemailtofolder
1729
+  echo 'MUTT_MAILBOXES=$(grep "mailboxes =" $MUTTRC)' >> /usr/bin/addemailtofolder
1730
+  echo 'if [[ $MUTT_MAILBOXES != *$MAILINGLIST* ]]; then' >> /usr/bin/addemailtofolder
1731
+  echo '  if ! grep -q "=$MAILINGLIST" $MUTTRC; then' >> /usr/bin/addemailtofolder
1732
+  echo '    sed -i "s|$MUTT_MAILBOXES|$MUTT_MAILBOXES =$MAILINGLIST|g" $MUTTRC' >> /usr/bin/addemailtofolder
1733
+  echo '    chown $MYUSERNAME:$MYUSERNAME $MUTTRC' >> /usr/bin/addemailtofolder
1734
+  echo '  fi' >> /usr/bin/addemailtofolder
1735
+  echo 'fi' >> /usr/bin/addemailtofolder
1736
+  echo 'exit 0' >> /usr/bin/addemailtofolder
1737
+  chmod +x /usr/bin/addemailtofolder
1738
   echo 'folders_for_email_addresses' >> $COMPLETION_FILE
1738
   echo 'folders_for_email_addresses' >> $COMPLETION_FILE
1739
 }
1739
 }
1740
 
1740
 
1882
   sed -i 's/#smtp_port: 25/smtp_port: 465/g' /etc/schleuder/schleuder.conf
1882
   sed -i 's/#smtp_port: 25/smtp_port: 465/g' /etc/schleuder/schleuder.conf
1883
   sed -i 's/#superadminaddr: root@localhost/superadminaddr: root@localhost' /etc/schleuder/schleuder.conf
1883
   sed -i 's/#superadminaddr: root@localhost/superadminaddr: root@localhost' /etc/schleuder/schleuder.conf
1884
   schleuder-newlist $PRIVATE_MAILING_LIST@$DOMAIN_NAME -realname "$PRIVATE_MAILING_LIST" -adminaddress $MY_USERNAME@$DOMAIN_NAME -initmember $MY_USERNAME@$DOMAIN_NAME -initmemberkey $MY_GPG_PUBLIC_KEY -nointeractive
1884
   schleuder-newlist $PRIVATE_MAILING_LIST@$DOMAIN_NAME -realname "$PRIVATE_MAILING_LIST" -adminaddress $MY_USERNAME@$DOMAIN_NAME -initmember $MY_USERNAME@$DOMAIN_NAME -initmemberkey $MY_GPG_PUBLIC_KEY -nointeractive
1885
-  emailrule $MY_USERNAME $PRIVATE_MAILING_LIST@$DOMAIN_NAME $PRIVATE_MAILING_LIST
1885
+  addemailtofolder $MY_USERNAME $PRIVATE_MAILING_LIST@$DOMAIN_NAME $PRIVATE_MAILING_LIST
1886
 
1886
 
1887
   echo 'schleuder:' > /etc/exim4/conf.d/router/550_exim4-config_schleuder
1887
   echo 'schleuder:' > /etc/exim4/conf.d/router/550_exim4-config_schleuder
1888
   echo '  debug_print = "R: schleuder for $local_part@$domain"' >> /etc/exim4/conf.d/router/550_exim4-config_schleuder
1888
   echo '  debug_print = "R: schleuder for $local_part@$domain"' >> /etc/exim4/conf.d/router/550_exim4-config_schleuder