From 9738316ab5e9a39dd31ea891f34a2409c711216c Mon Sep 17 00:00:00 2001 From: Oleksandr Vlasiuk Date: Thu, 6 Jun 2019 19:53:58 +0300 Subject: [PATCH 01/15] Handle + in notmuch queries (#233) --- share/mutt-wizard.muttrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc index c8b7b59..a6a19f3 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -61,7 +61,7 @@ bind editor complete-query macro index,pager a "|abook --add-email\n" 'add sender to abook' macro index \Cr "T~UN." "mark all messages as read" macro index O "mailsync -Va" "run offlineimap to sync all mail" -macro index \Cf "unset wait_keyread -p 'Enter a search term to find with notmuch: ' x; echo \$x >~/.cache/mutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;chomp@a;s/\^id:// for@a;$,=\"|\";print@a'\`\"" "show only messages matching a notmuch pattern" +macro index \Cf "unset wait_keyread -p 'Enter a search term to find with notmuch: ' x; echo \$x >~/.cache/mutt_terms~i \"\`notmuch search --output=messages \$(cat ~/.cache/mutt_terms) | head -n 600 | perl -le '@a=<>;s/\^id:// for@a;$,=\"|\";print@a' | perl -le '@a=<>; chomp@a; s/\\+/\\\\+/ for@a;print@a' \`\"" "show only messages matching a notmuch pattern" macro index A "all\n" "show all messages (undo limit)" # Sidebar mappings From d7dd9f89fe8ab68e730a6e81354ff2ada73e1b56 Mon Sep 17 00:00:00 2001 From: Kriss Date: Fri, 7 Jun 2019 18:12:20 +0200 Subject: [PATCH 02/15] actually terminate the script on Ctrl-C (#236) In my [PR 224](https://github.com/LukeSmithxyz/mutt-wizard/pull/224), I introduced a bug. While I was catching SIGINT with the trap statement, I did not actually exit the script and returned into the shell. Fixes https://github.com/LukeSmithxyz/mutt-wizard/issues/234 --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 610b8c4..651dd90 100755 --- a/bin/mw +++ b/bin/mw @@ -316,7 +316,7 @@ synchronize_flags=true gpg_path=$GPG" echo "$nmbasic" > "$NOTMUCH_CONFIG" ;} -trap 'echo -e "\033[0m\n"' INT +trap 'echo -e "\033[0m\n"; exit' STOP INT ABRT KILL case "$1" in ls) list ;; From b3ce4277abf0f9332c740bf574760f7b6d7bf2a6 Mon Sep 17 00:00:00 2001 From: badmrfrosty <49749436+badmrfrosty@users.noreply.github.com> Date: Sun, 16 Jun 2019 22:30:57 +0200 Subject: [PATCH 03/15] Avoid lags with some email providers while using IMAP (#238) I contacted MUTT irc channel to solve severe lags while navigating mailboxes of certain email providers with IMAP) (the emails were not stored locally). After extensive testing, changing the default value of mail_check from 5 to 60 solved my problem. I propose this change because several other people might encounter the same problem (especially yahoo users) --- share/mutt-wizard.muttrc | 1 + 1 file changed, 1 insertion(+) diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc index a6a19f3..1ca0503 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -22,6 +22,7 @@ set forward_format = "Fwd: %s" # format of subject when forwarding set forward_quote # include message in forwards set reverse_name # reply as whomever it was to set include # include message in replies +set mail_check=60 # to avoid lags using IMAP with some email providers (yahoo for example) auto_view text/html # automatically show html (mailcap uses w3m) auto_view application/pgp-encrypted alternative_order text/plain text/enriched text/html From c5ec2dab2659e7d5c04d04c4e78aac8569a8e1ba Mon Sep 17 00:00:00 2001 From: Geometer1729 <16kuhnb@gmail.com> Date: Mon, 17 Jun 2019 13:41:34 -0400 Subject: [PATCH 04/15] Add clarkson.edu and odu.edu (#242) --- share/domains.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/domains.csv b/share/domains.csv index be4819b..3e98c0c 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -214,4 +214,6 @@ yandex.net,imap.yandex.com,993,smtp.yandex.com,587 yandex.ru,imap.yandex.com,993,smtp.yandex.com,587 yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 +clarkson.edu,imap.gmail.com,993,smtp.gmail.com,587 +odu.edu,imap.gmail.com,993,smtp.gmail.com,587 From 68b323cb285b873263a7972d68705fadfacdb390 Mon Sep 17 00:00:00 2001 From: Youssef Mahmoud Date: Wed, 19 Jun 2019 21:26:13 -0500 Subject: [PATCH 05/15] Added UT Dallas mail settings (#244) pretty easy to find on their website, yet a short timesaver for students who bump into this in the future --- share/domains.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index 3e98c0c..a75c472 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -216,4 +216,4 @@ yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 clarkson.edu,imap.gmail.com,993,smtp.gmail.com,587 odu.edu,imap.gmail.com,993,smtp.gmail.com,587 - +utdallas.edu,outlook.office365.com,993,smtp.office365.com,587 From 86cd3ad33f6e6453db54e7cd507e85ec0da32055 Mon Sep 17 00:00:00 2001 From: Jacob Lamoure Date: Thu, 20 Jun 2019 15:19:05 -0700 Subject: [PATCH 06/15] Add infomaniak.ch to domains.csv (#245) Referencing https://www.infomaniak.com/en/support/faq/1524/mozilla-thunderbird-configuring-a-new-infomaniak-email-address --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index a75c472..ba85eeb 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -107,6 +107,7 @@ hushmail.com,imap.hushmail.com,993,smtp.hushmail.com,465 illinois.edu, imap.gmail.com,993,smtp.gmail.com,465 iname.com,imap.mail.com,993,smtp.mail.com,587 inf.h-brs.de,imap.inf.h-brs.de,993,smtp.inf.h-brs.de,587 +infomaniak.com,imap.infomaniak.com,993,imap.infomaniak.com,587 insiberia.net,mail.autistici.org,993,smtp.autistici.org,465 insicuri.net,mail.autistici.org,993,smtp.autistici.org,465 interia.eu,poczta.interia.pl,993,poczta.interia.pl,465 From 8fb26e4cea8c1e03eb41e2b5ac8d901e32be7c17 Mon Sep 17 00:00:00 2001 From: ZethJack Date: Wed, 3 Jul 2019 14:24:29 +0200 Subject: [PATCH 07/15] added forpsi.com, sorted domains alphabetically (#248) --- share/domains.csv | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/share/domains.csv b/share/domains.csv index ba85eeb..7c0a155 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -19,10 +19,10 @@ archaeologist.com,imap.mail.com,993,smtp.mail.com,587 arcticmail.com,imap.mail.com,993,smtp.mail.com,587 artlover.com,imap.mail.com,993,smtp.mail.com,587 asia.com,imap.mail.com,993,smtp.mail.com,587 -autograf.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 auctioneer.net,imap.mail.com,993,smtp.mail.com,587 autistiche.org,mail.autistici.org,993,smtp.autistici.org,465 autistici.org,mail.autistici.org,993,smtp.autistici.org,465 +autograf.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 autoproduzioni.net,mail.autistici.org,993,smtp.autistici.org,465 bartender.net,imap.mail.com,993,smtp.mail.com,587 bastardi.net,mail.autistici.org,993,smtp.autistici.org,465 @@ -35,15 +35,16 @@ brew-meister.com,imap.mail.com,993,smtp.mail.com,587 bruttocarattere.org,mail.autistici.org,993,smtp.autistici.org,465 canaglie.net,mail.autistici.org,993,smtp.autistici.org,465 canaglie.org,mail.autistici.org,993,smtp.autistici.org,465 +carleton.ca,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 cash4u.com,imap.mail.com,993,smtp.mail.com,587 cheerful.com,imap.mail.com,993,smtp.mail.com,587 chef.net,imap.mail.com,993,smtp.mail.com,587 chemist.com,imap.mail.com,993,smtp.mail.com,587 chrissx.ga,chrissx.ga,993,chrissx.ga,25 +clarkson.edu,imap.gmail.com,993,smtp.gmail.com,587 clerk.com,imap.mail.com,993,smtp.mail.com,587 clubmember.org,imap.mail.com,993,smtp.mail.com,587 cmail.carleton.ca,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 -carleton.ca,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 cocaine.ninja,mail.cock.li,993,mail.cock.li,587 cock.email,mail.cock.li,993,mail.cock.li,587 cock.li,mail.cock.li,993,mail.cock.li,587 @@ -78,6 +79,7 @@ europe.com,imap.mail.com,993,smtp.mail.com,587 fastmail.com,imap.fastmail.com,993,smtp.fastmail.com,465 fastmail.fm,imap.fastmail.com,993,smtp.fastmail.com,465 firemail.cc,mail.cock.li,993,mail.cock.li,587 +forpsi.com,imap.forpsi.com,993,smtp.forpsi.com,465 forthnet.gr,mail.forthnet.gr,993,smtp-auth.forthnet.gr,465 fsmpi.rwth-aachen.de,mail.fsmpi.rwth-aachen.de,993,mail.fsmpi.rwth-aachen.de,465 fsu-jena,exchange.uni-jena.de,993,smtp.uni-jena.de,587 @@ -87,10 +89,10 @@ gmx.at,imap.gmx.net,993,mail.gmx.net,587 gmx.com,imap.gmx.net,993,mail.gmx.net,587 gmx.de,imap.gmx.net,993,mail.gmx.net,587 gmx.eu,imap.gmx.net,993,mail.gmx.net,587 +gmx.fr,imap.gmx.com,993,mail.gmx.com,587 gmx.info,imap.gmx.net,993,mail.gmx.net,587 gmx.net,imap.gmx.net,993,mail.gmx.net,587 gmx.org,imap.gmx.net,993,mail.gmx.net,587 -gmx.fr,imap.gmx.com,993,mail.gmx.com,587 go2.pl,poczta.o2.pl,993,poczta.o2.pl,465 goat.si,mail.cock.li,993,mail.cock.li,587 googlemail.com,imap.googlemail.com,993,smtp.googlemail.com,587 @@ -110,9 +112,9 @@ inf.h-brs.de,imap.inf.h-brs.de,993,smtp.inf.h-brs.de,587 infomaniak.com,imap.infomaniak.com,993,imap.infomaniak.com,587 insiberia.net,mail.autistici.org,993,smtp.autistici.org,465 insicuri.net,mail.autistici.org,993,smtp.autistici.org,465 +interactio.io,imap.gmail.com,993,smtp.gmail.com,587 interia.eu,poczta.interia.pl,993,poczta.interia.pl,465 interia.pl,poczta.interia.pl,993,poczta.interia.pl,465 -interactio.io,imap.gmail.com,993,smtp.gmail.com,587 inventati.org,mail.autistici.org,993,smtp.autistici.org,465 kipras.org,mail.kipras.org,993,mail.kipras.org,587 krutt.org,mail.autistici.org,993,smtp.autistici.org,465 @@ -124,6 +126,7 @@ loves.dicksinhisan.us,mail.cock.li,993,mail.cock.li,587 loves.dicksinmyan.us,mail.cock.li,993,mail.cock.li,587 lukesmith.xyz,mail.lukesmith.xyz,993,mail.lukesmith.xyz,587 mail.com,imap.mail.com,993,smtp.mail.com,587 +mail.polimi.it,outlook.office365.com,993,smtp.office365.com,587 mail.ru,imap.mail.ru,993,smtp.mail.ru,465 mailbox.org,imap.mailbox.org,993,smtp.mailbox.org,587 memeware.net,mail.cock.li,993,mail.cock.li,587 @@ -139,6 +142,7 @@ nigge.rs,mail.cock.li,993,mail.cock.li,587 nuke.africa,mail.cock.li,993,mail.cock.li,587 nyu.edu,imap.gmail.com,993,smtp.gmail.com,587 o2.pl,poczta.o2.pl,993,poczta.o2.pl,465 +odu.edu,imap.gmail.com,993,smtp.gmail.com,587 one.com,imap.one.com,993,send.one.com,465 onenetbeyond.org,mail.autistici.org,993,smtp.autistici.org,465 onet.com.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 @@ -148,15 +152,14 @@ online.de,imap.1und1.de,993,smtp.1und1.de,465 op.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 opoczta.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 orange.fr,imap.orange.fr,993,smtp.orange.fr,465 +outlook.at,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 outlook.com,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 outlook.de,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 -outlook.at,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 paranoici.org,mail.autistici.org,993,smtp.autistici.org,465 pm.me,127.0.0.1,1143,127.0.0.1,1025 poczta.fm,poczta.interia.pl,993,poczta.interia.pl,465 poczta.onet.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 polimi.it,outlook.office365.com,993,smtp.office365.com,587 -mail.polimi.it,outlook.office365.com,993,smtp.office365.com,587 post.com,imap.mail.com,993,smtp.mail.com,587 posteo.de,posteo.de,993,posteo.de,587 posteo.net,posteo.de,993,posteo.de,587 @@ -192,6 +195,7 @@ uach.mx,imap.gmail.com,993,smtp.gmail.com,587 uoregon.edu,imap.uoregon.edu,993,smtp.uoregon.edu,587 uqtr.ca,outlook.office365.com,993,smtp.office365.com,587 usa.com,imap.mail.com,993,smtp.mail.com,587 +utdallas.edu,outlook.office365.com,993,smtp.office365.com,587 uw.edu,imap.gmail.com,993,smtp.gmail.com,465 uymail.com,imap.mail.com,993,smtp.mail.com,587 vip.onet.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 @@ -206,8 +210,8 @@ web.de,imap.web.de,993,smtp.web.de,587 wp.pl,imap.wp.pl,993,smtp.wp.pl,465 writeme.com,imap.mail.com,993,smtp.mail.com,587 ya.ru,imap.yandex.com,993,smtp.yandex.com,587 -yahoo.fr,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,587 yahoo.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,587 +yahoo.fr,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,587 yandex.by,imap.yandex.com,993,smtp.yandex.com,587 yandex.com,imap.yandex.com,993,smtp.yandex.com,587 yandex.kz,imap.yandex.com,993,smtp.yandex.com,587 @@ -215,6 +219,3 @@ yandex.net,imap.yandex.com,993,smtp.yandex.com,587 yandex.ru,imap.yandex.com,993,smtp.yandex.com,587 yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 -clarkson.edu,imap.gmail.com,993,smtp.gmail.com,587 -odu.edu,imap.gmail.com,993,smtp.gmail.com,587 -utdallas.edu,outlook.office365.com,993,smtp.office365.com,587 From 735d34347b757b9570c3cc897790dc9f762ce69b Mon Sep 17 00:00:00 2001 From: blinklad <41582020+blinklad@users.noreply.github.com> Date: Tue, 9 Jul 2019 09:42:53 +1000 Subject: [PATCH 08/15] Update domains.csv (#254) Add utas.edu.au --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 7c0a155..473194d 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -195,6 +195,7 @@ uach.mx,imap.gmail.com,993,smtp.gmail.com,587 uoregon.edu,imap.uoregon.edu,993,smtp.uoregon.edu,587 uqtr.ca,outlook.office365.com,993,smtp.office365.com,587 usa.com,imap.mail.com,993,smtp.mail.com,587 +utas.edu.au,outlook.office365.com,993,smtp.office365.com,587 utdallas.edu,outlook.office365.com,993,smtp.office365.com,587 uw.edu,imap.gmail.com,993,smtp.gmail.com,465 uymail.com,imap.mail.com,993,smtp.mail.com,587 From 274b32877a14b1cf22f19110027db7f16756a13c Mon Sep 17 00:00:00 2001 From: Tyler Kaminski <52117562+durcor@users.noreply.github.com> Date: Mon, 8 Jul 2019 19:43:11 -0400 Subject: [PATCH 09/15] Added stevens.edu server info (#253) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 473194d..386d154 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -175,6 +175,7 @@ sapo.pt,imap.sapo.pt,993,smtp.sapo.pt,587 smail.inf.h-brs.de,imap.inf.h-brs.de,993,smtp.inf.h-brs.de,587 southwales.ac.uk,imap.gmail.com,993,smtp.gmail.com,587 spoko.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 +stevens.edu,imap-mail.outlook.com,993,smpt-mail.outlook.com,587 stronzi.org,mail.autistici.org,993,smtp.autistici.org,465 stud.tu-darmstadt.de,imap.stud.tu-darmstadt.de,993,smtp.tu-darmstadt.de,465 stud.uis.no,outlook.office365.com,993,smtp.office365.com,587 From ed30adc63c254c344d1e4338040ac0f3fde9eb02 Mon Sep 17 00:00:00 2001 From: Konstantinos Vlachopoulos Date: Tue, 9 Jul 2019 02:43:21 +0300 Subject: [PATCH 10/15] Added yahoo.gr to domains.csv (#252) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 386d154..0e3b5b6 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -214,6 +214,7 @@ writeme.com,imap.mail.com,993,smtp.mail.com,587 ya.ru,imap.yandex.com,993,smtp.yandex.com,587 yahoo.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,587 yahoo.fr,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,587 +yahoo.gr,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,587 yandex.by,imap.yandex.com,993,smtp.yandex.com,587 yandex.com,imap.yandex.com,993,smtp.yandex.com,587 yandex.kz,imap.yandex.com,993,smtp.yandex.com,587 From ed2bb03f2dc313996ad8ceffc2feac80efde216f Mon Sep 17 00:00:00 2001 From: blinklad <41582020+blinklad@users.noreply.github.com> Date: Tue, 9 Jul 2019 23:22:31 +1000 Subject: [PATCH 11/15] Update README.md (#255) Clarify 'long' to 'longer'. Pedantic, 50% more bloat in characters but correct. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 258a232..e1e58e7 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ To give you an example of the interface, here's an idea: - `isync`/`mbsync` has replaced `offlineimap` as the backend. Offlineimap was error-prone, bloated, used obsolete Python 2 modules and required separate steps to install the system. - `mw` is now an installed program instead of just a script needed to be kept in your mutt folder. -- `dialog` is no long used (le bloat) and the interface is simply text commands. +- `dialog` is no longer used (le bloat) and the interface is simply text commands. - More autogenerated shortcuts that allow quickly moving and copying mail between boxes. - More elegant attachment handling. Image/video/pdf attachments without relying on the neomutt instance. - abook integration by default. From c37a748227a7c81519ae73cdbb69f3a3368833f8 Mon Sep 17 00:00:00 2001 From: Robert White Date: Tue, 23 Jul 2019 08:24:58 +1000 Subject: [PATCH 12/15] Surround value of imap_pass with quotes (#260) If the password contains single quotes and is not surrounded by quotes, Mutt removes the single quotes, rendering an incorrect password. --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 651dd90..8ba5d39 100755 --- a/bin/mw +++ b/bin/mw @@ -107,7 +107,7 @@ set folder = \"imaps://$fulladdr@$imap:$iport\" set imap_user = \"$login\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies -set imap_pass = \`pass mutt-wizard-$title\` +set imap_pass = \"\`pass mutt-wizard-$title\`\" set mbox_type = Maildir set ssl_starttls = yes From 7a31e3f466e356fc62220e45aebd690d4426c426 Mon Sep 17 00:00:00 2001 From: 4every1 Date: Sat, 3 Aug 2019 16:18:16 +0300 Subject: [PATCH 13/15] Added tquad.ai to domains.csv (#263) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 0e3b5b6..44d2e7f 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -222,3 +222,4 @@ yandex.net,imap.yandex.com,993,smtp.yandex.com,587 yandex.ru,imap.yandex.com,993,smtp.yandex.com,587 yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 +tquad.ai,imap.mail.eu-west-1.awsapps.com,993,smtp.mail.eu-west-1.awsapps.com,465 From c41d0949b2ff82c6fbcefa5fa5299529497577d5 Mon Sep 17 00:00:00 2001 From: Allen Sobot Date: Sat, 3 Aug 2019 15:44:10 +0200 Subject: [PATCH 14/15] Add etu.upmc.fr to domains.csv (#264) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 44d2e7f..398adc2 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -194,6 +194,7 @@ tuhh.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 txstate.edu,outlook.office365.com,993,smtp.office365.com,587 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 uoregon.edu,imap.uoregon.edu,993,smtp.uoregon.edu,587 +etu.upmc.fr,courriel.upmc.fr,993,smtps.upmc.fr,587 uqtr.ca,outlook.office365.com,993,smtp.office365.com,587 usa.com,imap.mail.com,993,smtp.mail.com,587 utas.edu.au,outlook.office365.com,993,smtp.office365.com,587 From 48f61faef7bb7eecc525e410f9ba699652f9ad4d Mon Sep 17 00:00:00 2001 From: WhaleJ84 <43613409+WhaleJ84@users.noreply.github.com> Date: Tue, 6 Aug 2019 13:07:18 +0100 Subject: [PATCH 15/15] Modified code to work better with Protonmail (#267) Added new search location for certificates and modified command that caused errors for Protonmail users. --- bin/mw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mw b/bin/mw index 8ba5d39..2499318 100755 --- a/bin/mw +++ b/bin/mw @@ -26,7 +26,7 @@ muttrc="$muttdir/muttrc" msmtprc="$HOME/.config/msmtp/config" ssltype="IMAPS" # This is later changed to `None` later in the script if using Protonmail -for x in "/etc/ssl/certs/ca-certificates.crt" "/etc/pki/tls/certs/ca-bundle.crt" "/etc/ssl/ca-bundle.pem" "/etc/pki/tls/cacert.pem" "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" "/etc/ssl/cert.pem" +for x in "/etc/ssl/certs/ca-certificates.crt" "/etc/pki/tls/certs/ca-bundle.crt" "/etc/ssl/ca-bundle.pem" "/etc/pki/tls/cacert.pem" "/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem" "/etc/ssl/cert.pem" "/usr/local/share/ca-certificates/" do [ -f "$x" ] && sslcert="$x" && break done || { echo "CA Certificate not found. Please install one or link it to /etc/ssl/certs/ca-certificates.crt" && exit 1 ;} @@ -194,7 +194,7 @@ EOF } protonfinger() { printf "Getting Protonmail bridge fingerprint...\\n" - fingerprint="$(msmtp --serverinfo --tls --tls-certcheck=off -a "$title")" || return 1 + fingerprint="$(msmtp --serverinfo --host=127.0.0.1 --port=1025 --tls --tls-certcheck=off)" || return 1 sed -ibu "s/account $title/&\ntls_trust_file\ntls_fingerprint $fingerprint/" "$msmtprc" ; rm -f "$msmtprc"bu }