Merge branch 'master' of github.com:LukeSmithxyz/mutt-wizard

1 files changed, 16 insertions, 2 deletions

diff --git a/bin/mw b/bin/mw
index 8712bf0..a89d5ef 100755
--- a/bin/mw
+++ b/bin/mw
@@ -134,8 +134,22 @@ askinfo() { \
 		printf "\033[0m"
 	done
 	domain="$(echo "$fulladdr" | sed "s/.*@//")"
+  search_query=$domain
+  case "$domain" in
+    protonmail.com|protonmail.ch|pm.me)
+      search_query='protonmail.com' && break;;
+    *)
+      while : ; do
+        printf "\nIs your email hosted with Protonmail? [yes/no] "
+        read -r is_protonmail
+        case $is_protonmail in
+          [Yy][Ee][Ss]) search_query='protonmail.com' && break;;
+          [Nn][Oo]) break;;
+          *) printf 'Please answer Yes or No'
+        esac; done;
+  esac
 	printf "\\nSearching for \033[32m%s\033[0m in \033[34m\`domains.csv\`\033[0m..." "$domain"
-	serverinfo="$(grep "^$domain" "$muttshare/domains.csv" 2>/dev/null)"
+	serverinfo="$(grep "^$search_query" "$muttshare/domains.csv" 2>/dev/null)"
 	if [ -z "$serverinfo" ]; then
 		printf "Your email domain is not in mutt-wizard's database yet.\\nmutt-wizard will still autoconfigure everything, but you will have to manually type in your service's IMAP and SMTP server information.\\nYou can usually quickly find this by internet searching for it.\\n"
 		printf "Insert the IMAP server for your email provider (excluding the port number)\\n\033[36m\t"
@@ -194,7 +208,7 @@ EOF
 }
 
 protonfinger() { printf "Getting Protonmail bridge fingerprint...\\n"
-	fingerprint="$(msmtp --serverinfo --host=127.0.0.1 --port=1025 --tls --tls-certcheck=off)" || return 1
+  fingerprint="$(msmtp --serverinfo --host=127.0.0.1 --port=1025 --tls --tls-certcheck=off | grep SHA256: | sed 's/^.*: //')"
 	sed -ibu "s/account $title/&\ntls_trust_file\ntls_fingerprint $fingerprint/" "$msmtprc" ; rm -f "$msmtprc"bu
 }