mutt-wizard

commit 2230c4153aaf5301984a94709e0c8dabf9b956a6
parent 4d411d81798f652fcdfd55d866c4e78f8867a9bc
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Thu,  4 Mar 2021 08:22:52 -0500

protonmail smtp, fix #667

Diffstat:
M
bin/mw
 | 
5
+++--
M
share/domains.csv
 | 
4
++--

2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/bin/mw b/bin/mw
@@ -34,7 +34,7 @@ port ${sport:-587}
 from $fulladdr
 user $login
 passwordeval \"pass $fulladdr\"
-auth on
+auth ${auth:-on}
 ${tlsline:-tls on}
 tls_trust_file	$sslcert
 logfile $msmtplog
@@ -175,7 +175,7 @@ delete() { if [ -z "${fulladdr+x}" ]; then
 
 	# Get rid of those multiple newlines because I don't know awk well enough to do it by default lol.
 	for file in "$msmtprc" "$mbsyncrc" "$mpoprc"; do
- 		tr '\n' '|' < "$file" 2>/dev/null | sed "s/||\+/||/g" | tr '|' '\n' >> "$file"bu
+ 		tr '\n' '|' 2>/dev/null  < "$file" | sed "s/||\+/||/g" | tr '|' '\n' >> "$file"bu
 		mv -f "$file"bu "$file"
 	done
 }
@@ -348,6 +348,7 @@ while getopts "fpPXlhodTYD:y:i:I:s:S:u:a:n:x:m:t:" o; do case "${o}" in
 		iport="1143"
 		smtp="127.0.0.1"
 		sport="1025"
+		auth="login"
   		tlsline="tls_fingerprint $(msmtp --serverinfo --host=$smtp --port=$sport --tls --tls-certcheck=off | awk '/SHA256:/ {print $2}')"
 		setact add || exit 1
 		;;
diff --git a/share/domains.csv b/share/domains.csv
@@ -83,8 +83,8 @@ distruzione.org,mail.autistici.org,993,smtp.autistici.org,465
 dorriseaton.com,outlook.office365.com,993,smtp.office365.com,587
 dr.com,imap.mail.com,993,smtp.mail.com,587
 duke.edu,outlook.office365.com,993,smtp.office365.com,587
-e.email,mail.ecloud.global,993.00,mail.ecloud.global,587.00
-e.email,mail.ecloud.global,993.00,mail.ecloud.global,587.00
+e.email,mail.ecloud.global,993,mail.ecloud.global,587
+e.email,mail.ecloud.global,993,mail.ecloud.global,587
 email.arizona.edu,imap.gmail.com,993,smtp.gmail.com,587
 email.com,imap.mail.com,993,smtp.mail.com,587
 eneco.com,outlook.office365.com,993,smtp.office365.com,587