From d7dd9f89fe8ab68e730a6e81354ff2ada73e1b56 Mon Sep 17 00:00:00 2001 From: Kriss Date: Fri, 7 Jun 2019 18:12:20 +0200 Subject: 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(-) (limited to 'bin') 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 ;; -- cgit v1.2.3 From c37a748227a7c81519ae73cdbb69f3a3368833f8 Mon Sep 17 00:00:00 2001 From: Robert White Date: Tue, 23 Jul 2019 08:24:58 +1000 Subject: 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(-) (limited to 'bin') 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 -- cgit v1.2.3 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: 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(-) (limited to 'bin') 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 } -- cgit v1.2.3