From b968bff93bb1a372bbb1a5a31a761fd09e964509 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Thu, 28 Nov 2019 16:27:10 -0500 Subject: [PATCH 01/73] STATUSBAR var now in subshell to prevent error --- bin/mailsync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index 2cec271..2d82690 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -48,7 +48,7 @@ else fi echo " 🔃" > /tmp/imapsyncicon_"$USER" -pkill -RTMIN+12 "${STATUSBAR:?}" >/dev/null 2>&1 +( pkill -RTMIN+12 "${STATUSBAR:?}" >/dev/null 2>&1 ) 2>/dev/null # Parallelize multiple accounts for account in $accounts @@ -58,7 +58,7 @@ done wait rm -f /tmp/imapsyncicon_"$USER" -pkill -RTMIN+12 "${STATUSBAR:?}" >/dev/null 2>&1 +( pkill -RTMIN+12 "${STATUSBAR:?}" >/dev/null 2>&1 ) 2>/dev/null notmuch new 2>/dev/null From 91242ee6cdcf929e651dd31c04b0939e1d9ab52a Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 1 Dec 2019 10:14:31 -0500 Subject: [PATCH 02/73] move and copy tagged messages if any --- bin/mw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mw b/bin/mw index e2939ec..568fef0 100755 --- a/bin/mw +++ b/bin/mw @@ -214,8 +214,8 @@ getpass() { while : ; do pass rm -f "mutt-wizard-$title" >/dev/null 2>&1 formatShortcut() { \ while read -r data; do { echo "macro index,pager g$1 \"$data\" \"go to $2\" # mw-autogenerated" - echo "macro index,pager M$1 \"$data\" \"move mail to $2\" # mw-autogenerated" - echo "macro index,pager C$1 \"$data\" \"copy mail to $2\" # mw-autogenerated"; } >> "$accdir/$idnum-$title.muttrc" + echo "macro index,pager M$1 \";$data\" \"move mail to $2\" # mw-autogenerated" + echo "macro index,pager C$1 \";$data\" \"copy mail to $2\" # mw-autogenerated"; } >> "$accdir/$idnum-$title.muttrc" done ;} tryconnect() { mkdir -p "$maildir/$title" From 5dc0d4ccba1dc513a4d06420e0f7a82c57e57080 Mon Sep 17 00:00:00 2001 From: BachoSeven <55460785+BachoSeven@users.noreply.github.com> Date: Sun, 8 Dec 2019 00:13:26 +0100 Subject: [PATCH 03/73] Update domains.csv (#345) uwcad.it- Gmail Server of the United World College of the Adriatic mail Services && studenti.unipi.it- Outlook Server of Pisa University mail Services --- share/domains.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/domains.csv b/share/domains.csv index 11c95d2..a9a6e2d 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -229,6 +229,7 @@ stud.uis.no,outlook.office365.com,993,smtp.office365.com,587 stud.uni-bamberg.de,outlook.office365.com,993,smtp.office365.com,587 student.rmit.edu.au,outlook.office365.com,993,smtp.office365.com,587 student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 +studenti.unipi.it,outlook.office365.com,995,smtp.office365.com,587 students.southwales.ac.uk,imap.gmail.com,993,smtp.gmail.com,587 studserv.uni-leipzig.de,studserv.uni-leipzig.de,993,studserv.uni-leipzig.de,25 subvertising.org,mail.autistici.org,993,smtp.autistici.org,465 @@ -253,6 +254,7 @@ 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 +uwcad.it,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 vivaldi.net,imap.vivaldi.net,993,smtp.vivaldi.net,587 From 6f0ad2d479e0e9a11a600dbe321227e9457044fc Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 8 Dec 2019 07:43:38 -0500 Subject: [PATCH 04/73] do not skip over deleted messages by default --- share/mutt-wizard.muttrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/mutt-wizard.muttrc b/share/mutt-wizard.muttrc index 2c96b19..dc58c48 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -30,6 +30,8 @@ bind index,pager g noop bind index \Cf noop # General rebindings +bind index j next-entry +bind index k previous-entry bind attach view-mailcap bind attach l view-mailcap bind editor noop From 548f2d130ff0e38dde50421778f843f848b1bdb8 Mon Sep 17 00:00:00 2001 From: Matan Deletic <37747595+DeleticMatan@users.noreply.github.com> Date: Mon, 16 Dec 2019 21:10:31 +0100 Subject: [PATCH 05/73] Add zohomail.eu to mutt-wizard database (#347) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index a9a6e2d..86a27e7 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -279,6 +279,7 @@ 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 +zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 polito.it,mail.polito.it,993,mail.polito.it,465 studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 hs-mittweida.de,mail.hs-mittweida.de,993,mail.hs-mittweida.de,465 From ab3368f1aaf63208c0cb6ae6f0c8bf685b9a4235 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 28 Dec 2019 08:48:46 -0500 Subject: [PATCH 06/73] display all flags/tags --- 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 dc58c48..3dd2f6c 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -5,7 +5,7 @@ # If you want to override any settings, set those in your muttrc. set mailcap_path = /usr/local/share/mutt-wizard/mailcap set date_format="%y/%m/%d %I:%M%p" -set index_format="%2C %zs %?X?A& ? %D %-15.15F %s (%-4.4c)" +set index_format="%2C %Z %?X?A& ? %D %-15.15F %s (%-4.4c)" set sort = 'reverse-date' set smtp_authenticators = 'gssapi:login' set query_command = "abook --mutt-query '%s'" From 36fee5ba2289d8cf93dd6ba31d89b480a81b50d5 Mon Sep 17 00:00:00 2001 From: Niklas Resch Date: Thu, 2 Jan 2020 14:16:33 +0100 Subject: [PATCH 07/73] Update domains.csv (#351) Changed Mailserver for my Domains from Migadu to self-hosted --- share/domains.csv | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/domains.csv b/share/domains.csv index 86a27e7..e7f60ea 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -61,7 +61,7 @@ counsellor.com,imap.mail.com,993,smtp.mail.com,587 cryptolab.net,mail.autistici.org,993,smtp.autistici.org,465 cumallover.me,mail.cock.li,993,mail.cock.li,587 cyberservices.com,imap.mail.com,993,smtp.mail.com,587 -datentopf.org,imap.migadu.com,993,smtp.migadu.com,587 +datentopf.org,mail.datentopf.org,993,mail.datentopf.org,587 deliveryman.com,imap.mail.com,993,smtp.mail.com,587 dicksinhisan.us,mail.cock.li,993,mail.cock.li,587 dicksinmyan.us,mail.cock.li,993,mail.cock.li,587 @@ -144,7 +144,7 @@ hotmail.rs,outlook.office365.com,993,smtp.office365.com,587 hotmail.se,outlook.office365.com,993,smtp.office365.com,587 hotmail.sg,outlook.office365.com,993,smtp.office365.com,587 hotmail.sk,outlook.office365.com,993,smtp.office365.com,587 -humbug.pw,imap.migadu.com,993,smtp.migadu.com,587 +humbug.pw,mail.humbug.pw,993,mail.humbug.pw,587 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 @@ -215,7 +215,7 @@ protonmail.ch,127.0.0.1,1143,127.0.0.1,1025 protonmail.com,127.0.0.1,1143,127.0.0.1,1025 rape.lol,mail.cock.li,993,mail.cock.li,587 redchan.it,mail.cock.li,993,mail.cock.li,587 -resch.pw,imap.migadu.com,993,smtp.migadu.com,587 +resch.pw,mail.resch.pw,993,mail.resch.pw,587 runbox.com,mail.runbox.com,993,mail.runbox.com,587 rwth-aachen.de,mail.rwth-aachen.de,993,mail.rwth-aachen.de,587 sapo.pt,imap.sapo.pt,993,smtp.sapo.pt,587 From a8a7f5883b52dd9056786c85b278ffaf09685137 Mon Sep 17 00:00:00 2001 From: thehnm <36209025+thehnm@users.noreply.github.com> Date: Wed, 8 Jan 2020 00:59:15 +0100 Subject: [PATCH 08/73] Add in.tum.de domain (#353) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index e7f60ea..0679a67 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -283,3 +283,4 @@ zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 polito.it,mail.polito.it,993,mail.polito.it,465 studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 hs-mittweida.de,mail.hs-mittweida.de,993,mail.hs-mittweida.de,465 +in.tum.de,mail.in.tum.de,993,mail.in.tum.de,465 From db362b25716abe2d38b08efab4e1edf53135df8b Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 19 Jan 2020 10:08:56 -0500 Subject: [PATCH 09/73] unity and ionos, resort --- share/domains.csv | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/share/domains.csv b/share/domains.csv index 11c95d2..651e474 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -1,5 +1,4 @@ ADDRESS,IMAP,imap port,SMTP,smtp port -icloud.com,imap.mail.me.com,993,smtp.mail.me.com,587 420blaze.it,mail.cock.li,993,mail.cock.li,587 8chan.co,mail.cock.li,993,mail.cock.li,587 aaathats3as.com,mail.cock.li,993,mail.cock.li,587 @@ -144,8 +143,10 @@ hotmail.rs,outlook.office365.com,993,smtp.office365.com,587 hotmail.se,outlook.office365.com,993,smtp.office365.com,587 hotmail.sg,outlook.office365.com,993,smtp.office365.com,587 hotmail.sk,outlook.office365.com,993,smtp.office365.com,587 +hs-mittweida.de,mail.hs-mittweida.de,993,mail.hs-mittweida.de,465 humbug.pw,imap.migadu.com,993,smtp.migadu.com,587 hushmail.com,imap.hushmail.com,993,smtp.hushmail.com,465 +icloud.com,imap.mail.me.com,993,smtp.mail.me.com,587 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 @@ -156,6 +157,7 @@ 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 inventati.org,mail.autistici.org,993,smtp.autistici.org,465 +ionos.de,imap.ionos.de,993,smtp.ionos.de,587 itu.dk,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 kipras.org,mail.kipras.org,993,mail.kipras.org,587 krutt.org,mail.autistici.org,993,smtp.autistici.org,465 @@ -206,6 +208,7 @@ 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 +polito.it,mail.polito.it,993,mail.polito.it,465 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 @@ -230,6 +233,7 @@ stud.uni-bamberg.de,outlook.office365.com,993,smtp.office365.com,587 student.rmit.edu.au,outlook.office365.com,993,smtp.office365.com,587 student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 students.southwales.ac.uk,imap.gmail.com,993,smtp.gmail.com,587 +studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 studserv.uni-leipzig.de,studserv.uni-leipzig.de,993,studserv.uni-leipzig.de,25 subvertising.org,mail.autistici.org,993,smtp.autistici.org,465 t-online.de,secureimap.t-online.de,993,securesmtp.t-online.de,465 @@ -247,6 +251,7 @@ txstate.edu,outlook.office365.com,993,smtp.office365.com,587 ua.pt,outlook.office365.com,993,mail.ua.pt,25 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 uni-duesseldorf.de,mail.hhu.de,993,mail.hhu.de,465 +unitybox.de,mail.unity-mail.de,993,mail.unity-mail.de,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 @@ -277,6 +282,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 -polito.it,mail.polito.it,993,mail.polito.it,465 -studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 -hs-mittweida.de,mail.hs-mittweida.de,993,mail.hs-mittweida.de,465 From 9ec671a128565c11c43ce511bd56024de325781b Mon Sep 17 00:00:00 2001 From: Yousef Akbar Date: Thu, 23 Jan 2020 12:36:14 -0800 Subject: [PATCH 10/73] domain ucdavis.edu details (#358) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index c604059..6c89f7a 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -254,6 +254,7 @@ tuhh.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 txstate.edu,outlook.office365.com,993,smtp.office365.com,587 ua.pt,outlook.office365.com,993,mail.ua.pt,25 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 +ucdavis.edu,imap.gmail.com,993,smtp.gmail.com,587 uni-duesseldorf.de,mail.hhu.de,993,mail.hhu.de,465 unitybox.de,mail.unity-mail.de,993,mail.unity-mail.de,587 uoregon.edu,imap.uoregon.edu,993,smtp.uoregon.edu,587 From 6ce45a0424aebbda30072c01ed1f9d12c12a73a1 Mon Sep 17 00:00:00 2001 From: Whitetiger Date: Sun, 2 Feb 2020 17:07:51 -0500 Subject: [PATCH 11/73] NCSU domain added. (#364) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 6c89f7a..7525083 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -185,6 +185,7 @@ muny.us,mail.muny.us,993,mail.muny.us,465 myself.com,imap.mail.com,993,smtp.mail.com,587 narod.ru,imap.yandex.com,993,smtp.yandex.com,587 national.shitposting.agency,mail.cock.li,993,mail.cock.li,587 +ncsu.edu,imap.gmail.com,993,smtp.gmail.com,587 netcourrier.com,mail.netcourrier.com,993,mail.netcourrier.com,465 nigge.rs,mail.cock.li,993,mail.cock.li,587 nuke.africa,mail.cock.li,993,mail.cock.li,587 From 265175b4a0c12709f3d8ce63d2decf59240d7d48 Mon Sep 17 00:00:00 2001 From: pallatinus Date: Fri, 7 Feb 2020 13:47:57 -0300 Subject: [PATCH 12/73] Zaclys domain added. (#365) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 7525083..bda8158 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -288,5 +288,6 @@ yandex.kz,imap.yandex.com,993,smtp.yandex.com,587 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 +zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 From 9b511f42f74633cd15240a1561c00b28ba8b8fdc Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 9 Feb 2020 07:49:12 -0500 Subject: [PATCH 13/73] find mailboxes recursively --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 568fef0..0e39046 100755 --- a/bin/mw +++ b/bin/mw @@ -230,7 +230,7 @@ tryconnect() { mkdir -p "$maildir/$title" fi ;} finalize() { \ - boxes="$(find "$maildir/$title/" -mindepth 1 -maxdepth 1 | sed "s/\ /\\\ /g;s/^.*\//=/")" + boxes="$(find "$maildir/$title/" -mindepth 1 -type d | sed "s/\ /\\\ /g;s/^.*\//=/;/=\(cur\|new\|tmp\)$/d")" [ -z "$boxes" ] && printf "\033[31mNo local mailboxes have been detected for %s.\033[0m\\nThis means that mbsync has not been successfully run.\\nRun mbsync, and if it has an error, be sure to check your password and server settings manually if needbe.\\n" "$title" && return printf "Setting default mailboxes for your Inbox, Sent, Drafts and Trash in mutt...\\n" spoolfile=$(echo "$boxes" | grep -i -m 1 inbox | sed 's/=/+/g') From 27ac8c6aa9af0bc93c5f39981a3c2f008c2945cc Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 9 Feb 2020 08:01:37 -0500 Subject: [PATCH 14/73] AuthMech LOGIN --- bin/mw | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/mw b/bin/mw index 0e39046..9302627 100755 --- a/bin/mw +++ b/bin/mw @@ -53,6 +53,7 @@ Port $iport User $login PassCmd \"pass mutt-wizard-$title\" SSLType $ssltype +AuthMech LOGIN CertificateFile $sslcert MaildirStore $title-local From 1e6bc3a2567199e06b6621b0497daa26a3bea959 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=20D=C3=B6rr?= Date: Sun, 9 Feb 2020 14:04:11 +0100 Subject: [PATCH 15/73] Add config for tum.de (#363) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index bda8158..712f2a9 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -252,6 +252,7 @@ tlu.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 tquad.ai,imap.mail.eu-west-1.awsapps.com,993,smtp.mail.eu-west-1.awsapps.com,465 tu-harburg.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 tuhh.de,mail.tu-harburg.de,993,mail.tu-harburg.de,587 +tum.de,xmail.mwn.de,993,postout.lrz.de,587 txstate.edu,outlook.office365.com,993,smtp.office365.com,587 ua.pt,outlook.office365.com,993,mail.ua.pt,25 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 From f9b31cbd9951dd4b383f3446975fa4f5af24dbca Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 9 Feb 2020 08:18:32 -0500 Subject: [PATCH 16/73] must type full yes --- bin/mw | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mw b/bin/mw index 9302627..576e90b 100755 --- a/bin/mw +++ b/bin/mw @@ -255,8 +255,8 @@ finalize() { \ return 0 } -confirm() { printf "Do you want to %s? [y/N]\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "^y$\|^yes$" >/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1 - printf "Are you really, really sure you want to %s?\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "^y$\|^yes$" >/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1 +confirm() { printf "Do you want to %s? [yes/N]\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "^yes$" >/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1 + printf "Are you really, really sure you want to %s?\\n\t" "$@" && read -r input && ! echo "$input" | grep -i "^yes$" >/dev/null && printf "That doesn't seem like a yes to me.\\n\\n" && return 1 return 0 ;} pick() { printf "Select an accounts to %s:\\n" "$1" From 4cb726546f679bdbab95a7e81937fe6d278578c0 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 9 Feb 2020 08:57:52 -0500 Subject: [PATCH 17/73] cron fixes and simplifications --- bin/mailsync | 16 +++++++++------- bin/mw | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index 2d82690..419848d 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -1,12 +1,6 @@ -#!/usr/bin/env sh +#!/bin/sh # Sync mail and give notification if there is new mail. -export PATH=$PATH:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin -DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus -export DBUS_SESSION_BUS_ADDRESS -export DISPLAY=:0.0 -[ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" - # Run only if user logged in (prevent cron errors) pgrep -u "${USER:=$LOGNAME}" >/dev/null || { echo "$USER not logged in; sync will not run."; exit ;} # Run only if not already running in other instance @@ -16,6 +10,14 @@ pgrep -x mbsync >/dev/null && { echo "mbsync is already running." ; exit ;} ping -q -c 1 1.1.1.1 > /dev/null || { echo "No internet connection detected."; exit ;} command -v notify-send >/dev/null || echo "Note that \`libnotify\` or \`libnotify-send\` should be installed for pop-up mail notifications with this script." +# Required to display notifications if run as a cronjob: +DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus +export DISPLAY=:0.0 + +# For individual configurations: +[ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" +pgrep i3blocks >/dev/null && STATUSBAR="i3blocks" || STATUSBAR="dwmblocks" + # Settings are different for MacOS (Darwin) systems. if [ "$(uname)" = "Darwin" ]; then notify() { osascript -e "display notification \"$2 in $1\" with title \"You've got Mail\" subtitle \"Account: $account\"" && sleep 2 ;} diff --git a/bin/mw b/bin/mw index 576e90b..98f2b99 100755 --- a/bin/mw +++ b/bin/mw @@ -290,7 +290,7 @@ choosecron() { ! pgrep cron >/dev/null && echo "No cron manager running. Install read -r minnum printf "\033[0m" done - (crontab -l; echo "*/$minnum * * * * export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus; export DISPLAY=:0; . \$HOME/.profile; $(type mailsync | cut -d' ' -f3)") | crontab - && + (crontab -l; echo "*/$minnum * * * * $(type mailsync | cut -d' ' -f3)") | crontab - && echo "Cronjob added. Mail will sync every $minnum minutes. Be sure you have your cron manager running." fi ;} From d8f57b57f6e4f7d07969a26775686b45b0e2b565 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sun, 9 Feb 2020 09:03:10 -0500 Subject: [PATCH 18/73] muttimage replaced by openfile --- bin/mailsync | 1 + bin/muttimage | 11 ----------- bin/mw | 3 ++- bin/openfile | 3 ++- share/mailcap | 2 +- 5 files changed, 6 insertions(+), 14 deletions(-) delete mode 100755 bin/muttimage diff --git a/bin/mailsync b/bin/mailsync index 419848d..326279c 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -1,4 +1,5 @@ #!/bin/sh + # Sync mail and give notification if there is new mail. # Run only if user logged in (prevent cron errors) diff --git a/bin/muttimage b/bin/muttimage deleted file mode 100755 index a846bea..0000000 --- a/bin/muttimage +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -#get image resolution -resolution=$(identify $1 | awk '{print $3}') -IFS='x' # x is set as delimiter -read -ra ADDR <<< "$resolution" -width=${ADDR[0]} -height=${ADDR[1]} - -### Display Image / offset with mutt bar -echo -e "2;3;\n0;1;0;42;$((width));$((height));0;0;0;0;$1\n4;\n3;" | /usr/lib/w3m/w3mimgdisplay & diff --git a/bin/mw b/bin/mw index 98f2b99..616b528 100755 --- a/bin/mw +++ b/bin/mw @@ -1,4 +1,5 @@ -#!/usr/bin/env sh +#!/bin/sh + command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" [ -z ${PASSWORD_STORE_DIR+x} ] && PASSWORD_STORE_DIR="$HOME/.password-store" [ -r "$PASSWORD_STORE_DIR/.gpg-id" ] && diff --git a/bin/openfile b/bin/openfile index b16483b..c0e2e9c 100755 --- a/bin/openfile +++ b/bin/openfile @@ -1,4 +1,5 @@ -#!/usr/bin/env sh +#!/bin/sh + # Helps open a file with xdg-open from mutt in a external program without weird side effects. [ $(uname) = "Darwin" ] && opener="open" || opener="setsid xdg-open" mkdir -p "/tmp/$USER-mutt-tmp" diff --git a/share/mailcap b/share/mailcap index 9687b75..f7a7541 100644 --- a/share/mailcap +++ b/share/mailcap @@ -1,7 +1,7 @@ text/plain; $EDITOR %s ; text/html; openfile %s ; nametemplate=%s.html text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -dump %s; nametemplate=%s.html; copiousoutput; -image/*; muttimage %s ; copiousoutput +image/*; openfile %s ; video/*; setsid mpv --quiet %s &; copiousoutput application/pdf; openfile %s ; application/pgp-encrypted; gpg -d '%s'; copiousoutput; From 528388cfeebfe83bd53f2499679b2ae2a538beeb Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 22 Feb 2020 10:37:15 -0500 Subject: [PATCH 19/73] old dox rm'd --- README.md | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.md b/README.md index a25d70b..1b72ef8 100644 --- a/README.md +++ b/README.md @@ -26,12 +26,6 @@ sudo make install User of Arch-based distros can also install mutt-wizard from the AUR as [mutt-wizard-git](https://aur.archlinux.org/packages/mutt-wizard-git/). -*NOTE:* If you have used an older version of mutt-wizard, especially when it used to use `offlineimap`, you need to remove your old configs. Back anything up that's important and run: - -``` -rm -rf ~/.config/mutt ~/.msmtprc ~/.config/msmtp ~/.offlineimap ~/.offlineimaprc ~/.config/offlineimap ~/.mbsyncrc -``` - The mutt-wizard is run with the command `mw`. It also installs the `mailsync` command. Once everything is setup, you'll use `neomutt` to access your mail. - `mw add` -- add a new email account From 82c01a9a6b5bc853f184f56fc43b47e92c0a73df Mon Sep 17 00:00:00 2001 From: grenzionky Date: Sat, 29 Feb 2020 05:58:07 -0500 Subject: [PATCH 20/73] add current email to status bar (#373) when u have multiple emails in neomutt at the same time, you can sometimes forget which email u'r currently viewing, so with this addition youll be able to see. all i did was add the email to the default status bar configuration --- bin/mw | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/mw b/bin/mw index 616b528..52a24b0 100755 --- a/bin/mw +++ b/bin/mw @@ -86,6 +86,7 @@ set folder = \"$maildir/$title\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set mbox_type = Maildir +set status_format="-%r-"$from": %D [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" bind index,pager gg noop bind index,pager g noop @@ -107,6 +108,7 @@ set imap_user = \"$login\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set imap_pass = \"\`pass mutt-wizard-$title\`\" +set status_format="-%r-"$from": %D [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" set mbox_type = Maildir set ssl_starttls = yes From a2ea17e9b4a8341c2a8883cd37fd0451f22f9071 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 29 Feb 2020 06:01:54 -0500 Subject: [PATCH 21/73] changes --- README.md | 3 +-- bin/mw | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 1b72ef8..e603745 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ The mutt-wizard is run with the command `mw`. It also installs the `mailsync` co - `mw add` -- add a new email account - `mw ls` -- list existing accounts - `mw pass` -- revise an account's password -- `mw delete` -- deleted an added account +- `mw delete` -- delete an added account - `mw purge` -- delete all accounts and settings - `mw cron` -- toggle/configure a cronjob to sync mail @@ -114,4 +114,3 @@ mutt-wizard is free/libre software, licensed under the GPLv3. - Add ~~Mac OS~~/BSD compatibility (the script is confired to work for Mac OS now) - ~~Out-of-the-box compatibility with Protonmail Bridge~~ (I believe this is done, but more bug-testing is welcome since I don't have PM) -- Option to keep configuration for accounts that failed to connect (maybe) diff --git a/bin/mw b/bin/mw index 616b528..0fd6375 100755 --- a/bin/mw +++ b/bin/mw @@ -4,7 +4,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" [ -z ${PASSWORD_STORE_DIR+x} ] && PASSWORD_STORE_DIR="$HOME/.password-store" [ -r "$PASSWORD_STORE_DIR/.gpg-id" ] && "$GPG" --list-secret-keys $(cat "$PASSWORD_STORE_DIR/.gpg-id") >/dev/null 2>&1 || { - printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init \`.\\nIf you don't have a GPG public private key pair, run \`$GPG --full-gen-key\` first.\\n" + printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init \`.\\nIf you don't have a GPG public private key pair, run \`%s --full-gen-key\` first.\\n" "$GPG" exit } ! command -v mbsync >/dev/null && printf "\`mbsync\` must be installed to run mutt-wizard.\\n" && exit From ee6101cb6e787255b19dcae035dd6b2be3a26f73 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 29 Feb 2020 16:58:32 -0500 Subject: [PATCH 22/73] undo retarded error --- bin/mw | 2 -- 1 file changed, 2 deletions(-) diff --git a/bin/mw b/bin/mw index 8202699..0fd6375 100755 --- a/bin/mw +++ b/bin/mw @@ -86,7 +86,6 @@ set folder = \"$maildir/$title\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set mbox_type = Maildir -set status_format="-%r-"$from": %D [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" bind index,pager gg noop bind index,pager g noop @@ -108,7 +107,6 @@ set imap_user = \"$login\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set imap_pass = \"\`pass mutt-wizard-$title\`\" -set status_format="-%r-"$from": %D [Msgs:%?M?%M/?%m%?n? New:%n?%?o? Old:%o?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?%?l? %l?]---(%s/%S)-%>-(%P)---" set mbox_type = Maildir set ssl_starttls = yes From 39f4e303e65defcd128a504a45a5cdf4e59d2cf4 Mon Sep 17 00:00:00 2001 From: Yogesh Manghnani <32590813+yogeshmanghnani@users.noreply.github.com> Date: Fri, 13 Mar 2020 00:46:59 +0530 Subject: [PATCH 23/73] Added ymail.com (Yahoo) domain to domains.csv (#382) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 712f2a9..fba3dd0 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -292,3 +292,4 @@ yandex.ua,imap.yandex.com,993,smtp.yandex.com,587 zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 +ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465 From 204908811396d42835c994974bccf3acddfd7de5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yi=C4=9Fit=20Sever?= Date: Fri, 13 Mar 2020 16:41:24 +0300 Subject: [PATCH 24/73] Add metu and ceng.metu domains (#369) Additionally, ceng.metu requires the `domain mailhost.ceng.metu.edu.tr` option to be added to msmtp config file --- share/domains.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/domains.csv b/share/domains.csv index fba3dd0..99c19bf 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -37,6 +37,7 @@ 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 +ceng.metu.edu.tr,imap.ceng.metu.edu.tr,993,mailhost.ceng.metu.edu.tr,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 @@ -178,6 +179,7 @@ mailbox.org,imap.mailbox.org,993,smtp.mailbox.org,587 mailbox.tu-dresden.de,msx.tu-dresden.de,993,msx.tu-dresden.de,587 mailo.com,mail.mailo.com,993,mail.mailo.com,465 memeware.net,mail.cock.li,993,mail.cock.li,587 +metu.edu.tr,imap.metu.edu.tr,993,smtp.metu.edu.tr,465 ml1.net,imap.fastmail.com,993,smtp.fastmail.com,465 mortemale.org,mail.autistici.org,993,smtp.autistici.org,465 msn.com,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 From 5ace69bdf56da3883b2666247aac462b0df5b020 Mon Sep 17 00:00:00 2001 From: Ashish Panigrahi Date: Fri, 13 Mar 2020 19:12:29 +0530 Subject: [PATCH 25/73] Update domains.csv (#380) Added the line: niser.ac.in,imap.gmail.com,993,smtp.gmail.com,587 --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 99c19bf..62cd135 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -190,6 +190,7 @@ national.shitposting.agency,mail.cock.li,993,mail.cock.li,587 ncsu.edu,imap.gmail.com,993,smtp.gmail.com,587 netcourrier.com,mail.netcourrier.com,993,mail.netcourrier.com,465 nigge.rs,mail.cock.li,993,mail.cock.li,587 +niser.ac.in,imap.gmail.com,993,smtp.gmail.com,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 From f8408e174c4a6be44ccda45202106c15fd93dc14 Mon Sep 17 00:00:00 2001 From: pizzacoca Date: Sun, 22 Mar 2020 22:12:50 +0100 Subject: [PATCH 26/73] aquilenet.fr added to domain.csv (#386) Co-authored-by: pizzacoca --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 62cd135..c6faf9a 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -15,6 +15,7 @@ anche.no,mail.autistici.org,993,smtp.autistici.org,465 angelic.com,imap.mail.com,993,smtp.mail.com,587 aol.com,imap.aol.com,993,smtp.aol.com,465 appraiser.net,imap.mail.com,993,smtp.mail.com,587 +aquilenet.fr,imap.aquilenet.fr,993,smtp.aquilenet.fr,587 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 From 73bb120cc246a60c3ba0bf3ba414a0e357cb4c8a Mon Sep 17 00:00:00 2001 From: Chau Bao Long Date: Mon, 23 Mar 2020 04:13:56 +0700 Subject: [PATCH 27/73] Fix Error: SASL(-7) with isync on macos. (#222) Co-authored-by: chau.bao.long --- bin/mw | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/mw b/bin/mw index 0fd6375..e7a673a 100755 --- a/bin/mw +++ b/bin/mw @@ -53,6 +53,7 @@ Host $imap Port $iport User $login PassCmd \"pass mutt-wizard-$title\" +AuthMechs LOGIN SSLType $ssltype AuthMech LOGIN CertificateFile $sslcert From e53e96f46104d84682a139e6f82a443901fa01cb Mon Sep 17 00:00:00 2001 From: ElonSatoshi Date: Sun, 22 Mar 2020 16:14:14 -0500 Subject: [PATCH 28/73] Add config for riseup.net (#368) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index c6faf9a..117ce5f 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -226,6 +226,7 @@ protonmail.com,127.0.0.1,1143,127.0.0.1,1025 rape.lol,mail.cock.li,993,mail.cock.li,587 redchan.it,mail.cock.li,993,mail.cock.li,587 resch.pw,mail.resch.pw,993,mail.resch.pw,587 +riseup.net,mail.riseup.net,993,mail.riseup.net,465 runbox.com,mail.runbox.com,993,mail.runbox.com,587 rwth-aachen.de,mail.rwth-aachen.de,993,mail.rwth-aachen.de,587 sapo.pt,imap.sapo.pt,993,smtp.sapo.pt,587 From 2131e643d723c43b102bfe4f7d7fdb8bf41fbde3 Mon Sep 17 00:00:00 2001 From: asparagusfox <58554967+asparagusfox@users.noreply.github.com> Date: Sat, 28 Mar 2020 23:00:37 +0000 Subject: [PATCH 29/73] Add config for rhul.ac.uk (#392) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 117ce5f..d86bcd8 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -168,6 +168,7 @@ kth.se,webmail.kth.se,993,smtp.kth.se,587 lavabit.com,lavabit.com,993,lavabit.com,587 linuxmail.org,imap.mail.com,993,smtp.mail.com,587 live.com,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 +live.rhul.ac.uk,outlook.office365.com,993,smtp.office365.com,587 logorroici.org,mail.autistici.org,993,smtp.autistici.org,465 loves.dicksinhisan.us,mail.cock.li,993,mail.cock.li,587 loves.dicksinmyan.us,mail.cock.li,993,mail.cock.li,587 From fd7afcc19759963a6807872ea50a88fb834af8bb Mon Sep 17 00:00:00 2001 From: ChelonianEgghead <49260310+ChelonianEgghead@users.noreply.github.com> Date: Thu, 2 Apr 2020 11:58:11 -0500 Subject: [PATCH 30/73] Add Mailfence (#396) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index d86bcd8..92556aa 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -179,6 +179,7 @@ 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 mailbox.tu-dresden.de,msx.tu-dresden.de,993,msx.tu-dresden.de,587 +mailfence.com,imap.mailfence.com,993,smtp.mailfence.com,465 mailo.com,mail.mailo.com,993,mail.mailo.com,465 memeware.net,mail.cock.li,993,mail.cock.li,587 metu.edu.tr,imap.metu.edu.tr,993,smtp.metu.edu.tr,465 From db9dae95a313666a1fef3f0d9c155f70b7474810 Mon Sep 17 00:00:00 2001 From: tech-tie <43925992+tech-tie@users.noreply.github.com> Date: Thu, 2 Apr 2020 18:58:22 +0200 Subject: [PATCH 31/73] Added live.de (#395) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 92556aa..6b6aa7e 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -168,6 +168,7 @@ kth.se,webmail.kth.se,993,smtp.kth.se,587 lavabit.com,lavabit.com,993,lavabit.com,587 linuxmail.org,imap.mail.com,993,smtp.mail.com,587 live.com,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 +live.de,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 live.rhul.ac.uk,outlook.office365.com,993,smtp.office365.com,587 logorroici.org,mail.autistici.org,993,smtp.autistici.org,465 loves.dicksinhisan.us,mail.cock.li,993,mail.cock.li,587 From 789f5932720fb05a232460ad89a8ef5fb8e46454 Mon Sep 17 00:00:00 2001 From: Lingyu Zhu <302590304@qq.com> Date: Sun, 5 Apr 2020 21:11:55 +0800 Subject: [PATCH 32/73] remove unnecessary prefix setting up msmtp. (#401) the prefix is not correct at least for Ubuntu distro. Since doc clearly states the dependencis. We assume msmpt is on the PATH environment. Co-authored-by: Lingyu Zhu --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index e7a673a..862f937 100755 --- a/bin/mw +++ b/bin/mw @@ -101,7 +101,7 @@ mutt_profile="# vim: filetype=neomuttrc # muttrc file for account $title set realname = \"$realname\" set from = \"$fulladdr\" -set sendmail = \"$prefix/bin/msmtp -a $title\" +set sendmail = \"msmtp -a $title\" alias me $realname <$fulladdr> set folder = \"imaps://$fulladdr@$imap:$iport\" set imap_user = \"$login\" From 11374f4182d73620dc45bad91e70ce21b9369d08 Mon Sep 17 00:00:00 2001 From: Leo Liu <38640768+leoliu0@users.noreply.github.com> Date: Fri, 10 Apr 2020 13:19:44 +1000 Subject: [PATCH 33/73] add ad.unsw.edu.au (#408) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 6b6aa7e..4476d65 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -4,6 +4,7 @@ ADDRESS,IMAP,imap port,SMTP,smtp port aaathats3as.com,mail.cock.li,993,mail.cock.li,587 accountant.com,imap.mail.com,993,smtp.mail.com,587 activist.com,imap.mail.com,993,smtp.mail.com,587 +ad.unsw.edu.au,outlook.office365.com,993,smtp.office365.com,587 adexec.com,imap.mail.com,993,smtp.mail.com,587 airmail.cc,mail.cock.li,993,mail.cock.li,587 allergist.com,imap.mail.com,993,smtp.mail.com,587 From f6ae7ddaf0a01373feffea3d56346bf39d8336d6 Mon Sep 17 00:00:00 2001 From: sudoLife Date: Fri, 10 Apr 2020 19:36:20 +0300 Subject: [PATCH 34/73] Fix a double "for" in manual (#409) --- mw.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mw.1 b/mw.1 index 2f04a48..c866c83 100644 --- a/mw.1 +++ b/mw.1 @@ -56,7 +56,7 @@ Neither .B delete or .B purge -will delete downloaded mail for for safety (and time)'s sake. If you want to delete downloaded mail, do so manually by removing it from the directory above. +will delete downloaded mail for safety (and time)'s sake. If you want to delete downloaded mail, do so manually by removing it from the directory above. .TP .B Default settings The mutt-wizard has many default settings that focus on making it aesthetically pleasing and supplying more vim-like bindings. These can be found in From 6a4afea526d1d102e2939f4f7e31bad13569ca12 Mon Sep 17 00:00:00 2001 From: dt098 <48135605+dt098@users.noreply.github.com> Date: Fri, 10 Apr 2020 23:14:36 +0200 Subject: [PATCH 35/73] Update domains.csv (#410) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 4476d65..001cd32 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -302,3 +302,4 @@ zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465 +unilodz.eu,outlook.office365.com,993,smtp.office365.com,587 From 50f227b4535ecd4b13b122ace7872468fa1ddc65 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 10 Apr 2020 22:45:33 -0400 Subject: [PATCH 36/73] blocks for STATUSBAR apparently works... --- bin/mailsync | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index 326279c..32c0825 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -17,7 +17,6 @@ export DISPLAY=:0.0 # For individual configurations: [ -d "$HOME/.local/share/password-store" ] && export PASSWORD_STORE_DIR="$HOME/.local/share/password-store" -pgrep i3blocks >/dev/null && STATUSBAR="i3blocks" || STATUSBAR="dwmblocks" # Settings are different for MacOS (Darwin) systems. if [ "$(uname)" = "Darwin" ]; then @@ -51,7 +50,7 @@ else fi echo " 🔃" > /tmp/imapsyncicon_"$USER" -( pkill -RTMIN+12 "${STATUSBAR:?}" >/dev/null 2>&1 ) 2>/dev/null +( pkill -RTMIN+12 "${STATUSBAR:-blocks}" >/dev/null 2>&1 ) 2>/dev/null # Parallelize multiple accounts for account in $accounts @@ -61,7 +60,7 @@ done wait rm -f /tmp/imapsyncicon_"$USER" -( pkill -RTMIN+12 "${STATUSBAR:?}" >/dev/null 2>&1 ) 2>/dev/null +( pkill -RTMIN+12 "${STATUSBAR:-blocks}" >/dev/null 2>&1 ) 2>/dev/null notmuch new 2>/dev/null From 7c980ec6fbc4e51f3fa663a541de4ff5a4f6587f Mon Sep 17 00:00:00 2001 From: ofwinterpassed Date: Sun, 12 Apr 2020 14:29:58 +0200 Subject: [PATCH 37/73] adding librem.one server info (#411) Co-authored-by: Johannes Christenson --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 001cd32..33217be 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -167,6 +167,7 @@ kipras.org,mail.kipras.org,993,mail.kipras.org,587 krutt.org,mail.autistici.org,993,smtp.autistici.org,465 kth.se,webmail.kth.se,993,smtp.kth.se,587 lavabit.com,lavabit.com,993,lavabit.com,587 +librem.one,imap.librem.one,993,smtp.librem.one,465 linuxmail.org,imap.mail.com,993,smtp.mail.com,587 live.com,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 live.de,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 From 946abe8f5fc97524cb58b8049bf2b37e71f55901 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Fri, 17 Apr 2020 10:21:59 -0400 Subject: [PATCH 38/73] new mail info for macos --- bin/mailsync | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/mailsync b/bin/mailsync index 32c0825..fc35ede 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -21,8 +21,10 @@ export DISPLAY=:0.0 # Settings are different for MacOS (Darwin) systems. if [ "$(uname)" = "Darwin" ]; then notify() { osascript -e "display notification \"$2 in $1\" with title \"You've got Mail\" subtitle \"Account: $account\"" && sleep 2 ;} + messageinfo() { osascript "display notification with title \"📧 $from\" subtitle \"$subject\"" ;} else notify() { notify-send --app-name="mutt-wizard" "mutt-wizard" "📬 $2 new mail(s) in \`$1\` account." ;} + messageinfo() { notify-send --app-name="mutt-wizard" "📧$from:" "$subject" ;} fi # Check account for new mail. Notify if there is new content. @@ -37,7 +39,7 @@ syncandnotify() { # Extract subject and sender from mail. from=$(awk '/^From: / && ++n ==1,/^\<.*\>:/' "$file" | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | awk '{ $1=""; if (NF>=3)$NF=""; print $0 }' | sed 's/^[[:blank:]]*[\"'\''\<]*//;s/[\"'\''\>]*[[:blank:]]*$//') subject=$(awk '/^Subject: / && ++n == 1,/^\<.*\>: / && ++i == 2' "$file" | head -n-1 | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | sed 's/^Subject: //' | sed 's/^{[[:blank:]]*[\"'\''\<]*//;s/[\"'\''\>]*[[:blank:]]*$//' | tr -d '\n') - notify-send --app-name="mutt-wizard" "📧$from:" "$subject" & + messageinfo & done fi } From 2698a4358c4747033b9c4dde3142d898e8c2004f Mon Sep 17 00:00:00 2001 From: Jackson Law <178053+jlaw@users.noreply.github.com> Date: Sat, 18 Apr 2020 07:47:32 -0700 Subject: [PATCH 39/73] fix: Support mbsync options passed to mailsync (#414) --- bin/mailsync | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bin/mailsync b/bin/mailsync index 32c0825..e6f2673 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -28,7 +28,7 @@ fi # Check account for new mail. Notify if there is new content. syncandnotify() { acc="$(echo "$account" | sed "s/.*\///")" - mbsync "$acc" + mbsync $opts "$acc" new=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" "$HOME/.local/share/mail/$acc/Inbox/new/" "$HOME/.local/share/mail/$acc/inbox/new/" -type f -newer "$HOME/.config/mutt/.mailsynclastrun" 2> /dev/null) newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l) if [ "$newcount" -gt "0" ]; then @@ -46,6 +46,9 @@ syncandnotify() { if [ "$#" -eq "0" ]; then accounts="$(awk '/^Channel/ {print $2}' "$HOME/.mbsyncrc")" else + for arg in "$@"; do + [ "${arg%${arg#?}}" = '-' ] && opts="${opts:+${opts} }${arg}" && shift 1 + done accounts=$* fi From 15151c8b442f2345cc621d43f498276137718f30 Mon Sep 17 00:00:00 2001 From: Jackson Law <178053+jlaw@users.noreply.github.com> Date: Sat, 18 Apr 2020 07:49:29 -0700 Subject: [PATCH 40/73] Remove AuthMech misspelled option (#415) According to man page of mbsync, AuthMechs is the correct spelling of the option. --- bin/mw | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/bin/mw b/bin/mw index 862f937..97b0172 100755 --- a/bin/mw +++ b/bin/mw @@ -50,12 +50,11 @@ $starttlsoff " mbsync_profile="IMAPStore $title-remote Host $imap -Port $iport +Port $iport User $login PassCmd \"pass mutt-wizard-$title\" AuthMechs LOGIN SSLType $ssltype -AuthMech LOGIN CertificateFile $sslcert MaildirStore $title-local From 3ee9cb73a0636aa2bae0c0417e1e8be52a8cbe5e Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Thu, 23 Apr 2020 15:21:40 -0400 Subject: [PATCH 41/73] notmuch ignores mbsync files by default --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 97b0172..ab941a8 100755 --- a/bin/mw +++ b/bin/mw @@ -321,7 +321,7 @@ name=$realname primary_email=$fulladdr [new] tags=unread;inbox; -ignore= +ignore=.mbsyncstate;.uidvalidity [search] exclude_tags=deleted;spam; [maildir] From d4613d3b192c325d661100a3a33cff08767be29e Mon Sep 17 00:00:00 2001 From: Alexander Bocken <32177905+AlexBocken@users.noreply.github.com> Date: Sat, 25 Apr 2020 21:56:13 +0200 Subject: [PATCH 42/73] added 2 domains (#421) --- share/domains.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/domains.csv b/share/domains.csv index 33217be..1563d6a 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -304,3 +304,5 @@ zoho.com,imap.zoho.com,993,smtp.zoho.com,465 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465 unilodz.eu,outlook.office365.com,993,smtp.office365.com,587 +ethz.ch,mail.ethz.ch,993,mail.ethz.ch,587 +bocken.org,imap.gmail.com,993,smtp.gmail.com,465 From 00ed237cf81c68e366c6d7c4f6b2dc652c2a1db2 Mon Sep 17 00:00:00 2001 From: Thalia Wright <46098109+halcyonseeker@users.noreply.github.com> Date: Mon, 27 Apr 2020 11:08:39 -0700 Subject: [PATCH 43/73] Improved protonmail advice (#423) --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index e603745..9e0a331 100644 --- a/README.md +++ b/README.md @@ -105,8 +105,8 @@ mutt-wizard is free/libre software, licensed under the GPLv3. ## Watch out for these things: - Gmail accounts can now create 'App Password' to use with """less secure""" applications. This password is single use (ie. for setup) and will be stored and encrypted locally. Enabling third-party applications requires turning off two-factor authentication and this will circumvent that. You might also need to manually "Enable IMAP" in the settings. -- Protonmail accounts will require you to set up "Protonmail Bridge" to access PM's IMAP and SMTP servers. Configure that before running mutt-wizard. -- Protonmail bridge is prone to timing out. Watch out for this while adding an account. If the bridge times out, try again. +- Protonmail accounts will require you to set up "Protonmail Bridge" to access PM's IMAP and SMTP servers. Configure that before running mutt-wizard. Note that when mutt-wizard asks for a password, you should put in your [bridge password](https://protonmail.com/bridge/thunderbird#3), not your account password. +- Protonmail bridge is prone to timing out. Watch out for this while adding an account. If the bridge times out, try again. It might help to [increase the timeout](https://protonmail.com/support/knowledge-base/thunderbird-connection-server-timed-error/) in your `mbsyncrc`. - If you have a university email, or enterprise-hosted email for work, there might be other hurdles or two-factor authentication you have to jump through. Some, for example, will want you to create a separate IMAP password, etc. - `isync` is not fully UTF-8 compatible, so non-Latin characters may be garbled (although sync should succeed). `mw` will also not autocreate mailbox shortcuts since it is looking for English mailbox names. I strongly recommend you to set your email language to English on your mail server to avoid these problems. From 069910c13ec1c89421372b8e54b40cd2ae783303 Mon Sep 17 00:00:00 2001 From: Francesco <55460785+BachoSeven@users.noreply.github.com> Date: Thu, 30 Apr 2020 17:05:57 +0200 Subject: [PATCH 44/73] corrected studenti.unipi.it imap port (#425) --- share/domains.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index 1563d6a..f01e0a5 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -245,7 +245,7 @@ stud.uis.no,outlook.office365.com,993,smtp.office365.com,587 stud.uni-bamberg.de,outlook.office365.com,993,smtp.office365.com,587 student.rmit.edu.au,outlook.office365.com,993,smtp.office365.com,587 student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 -studenti.unipi.it,outlook.office365.com,995,smtp.office365.com,587 +studenti.unipi.it,outlook.office365.com,993,smtp.office365.com,587 students.southwales.ac.uk,imap.gmail.com,993,smtp.gmail.com,587 studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 From 6fe26400957d9163a75f60fa0c18f266f25fbc85 Mon Sep 17 00:00:00 2001 From: Nai <52871629+nai666@users.noreply.github.com> Date: Thu, 30 Apr 2020 21:07:30 -0400 Subject: [PATCH 45/73] Update domains.csv (#426) imap and smtp for suny occ email --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index f01e0a5..0c8f815 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -45,6 +45,7 @@ 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 +clasnet.sunyocc.edu,outlook.office365.com,993,smtp.office365.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 From 943cfd2a9ef57430482b5b766cab98447f9c932e Mon Sep 17 00:00:00 2001 From: g-w1 <58830309+g-w1@users.noreply.github.com> Date: Wed, 6 May 2020 13:40:37 -0400 Subject: [PATCH 46/73] Change "syncthing" to "syncing". Typo. (#429) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9e0a331..fc0b51a 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,7 @@ There's a chance of errors if you use a slow-release distro like Ubuntu, Debian - `lynx` - view HTML email in neomutt. - `notmuch` - index and search mail. Install it and run `notmuch setup`, tell it that your mail is in `~/.local/share/mail/` (although `mw` will do this automatically if you haven't set notmuch up before). You can run it in mutt with `ctrl-f`. Run `notmuch new` to process new mail, although the included `mailsync` script does this for you. -- `libnotify`/`libnotify-bin` - allows notifications when syncthing mail with `mailsync` +- `libnotify`/`libnotify-bin` - allows notifications when syncing mail with `mailsync` - `abook` - a terminal-based address book. Pressing tab while typing an address to send mail to will suggest contacts that are in your abook. - A cron manager - if you want to enable the auto-sync feature. - `pam-gnupg` - this is a more general program that I use. It automatically logs you into your GPG key on login so you will never need to input your password once logged on to your system. Check the repo and directions out [here](https://github.com/cruegge/pam-gnupg). From 8753a8bc3bbcf00107ee47477b2dd9112a9e54b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Wo=C5=BAniak?= Date: Sat, 16 May 2020 22:43:16 +0200 Subject: [PATCH 47/73] Added st.amu.edu.pl (my collage) settings. (#437) Signed-off-by: Marcin Wozniak --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 0c8f815..758ab0b 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -239,6 +239,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 +st.amu.edu.pl,outlook.office365.com,993,smtp.office365.com,587 stevens.edu,imap.outlook.com,993,smtp.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 From 5fbb19e74a730771bd245fb7b5f73ff3741da4e2 Mon Sep 17 00:00:00 2001 From: qorg11 Date: Sun, 24 May 2020 21:17:41 +0200 Subject: [PATCH 48/73] Added vxempire.xyz to domains.cvs (#440) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 758ab0b..04926d5 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -308,3 +308,4 @@ ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465 unilodz.eu,outlook.office365.com,993,smtp.office365.com,587 ethz.ch,mail.ethz.ch,993,mail.ethz.ch,587 bocken.org,imap.gmail.com,993,smtp.gmail.com,465 +vxempire.xyz,vxempire.xyz,993,vxempire.xyz,587 From aaeb0a73dc0904f9258743683e96e2439f88ba56 Mon Sep 17 00:00:00 2001 From: qorg11 Date: Mon, 25 May 2020 12:38:07 +0200 Subject: [PATCH 49/73] Fix set_folder for vxempire.xyz (#441) * Added vxempire.xyz to domains.cvs * Fixed set_folder for vxempire.xyz --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index ab941a8..981f3d2 100755 --- a/bin/mw +++ b/bin/mw @@ -102,7 +102,7 @@ set realname = \"$realname\" set from = \"$fulladdr\" set sendmail = \"msmtp -a $title\" alias me $realname <$fulladdr> -set folder = \"imaps://$fulladdr@$imap:$iport\" +set folder = \"imaps://$login@$imap:$iport\" set imap_user = \"$login\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies From 3bf2023dd5a82ed1b3e53aad4d24d537e68105fc Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 25 May 2020 21:01:52 -0400 Subject: [PATCH 50/73] don't use extra icon file use kill instead of pkill for speed --- bin/mailsync | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index 3104c65..6ee7f51 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -54,8 +54,7 @@ else accounts=$* fi -echo " 🔃" > /tmp/imapsyncicon_"$USER" -( pkill -RTMIN+12 "${STATUSBAR:-blocks}" >/dev/null 2>&1 ) 2>/dev/null +( kill -46 "$(pidof "${STATUSBAR:-dwmblocks}")" >/dev/null 2>&1 ) 2>/dev/null # Parallelize multiple accounts for account in $accounts @@ -64,8 +63,7 @@ do done wait -rm -f /tmp/imapsyncicon_"$USER" -( pkill -RTMIN+12 "${STATUSBAR:-blocks}" >/dev/null 2>&1 ) 2>/dev/null +( kill -46 "$(pidof "${STATUSBAR:-dwmblocks}")" >/dev/null 2>&1 ) 2>/dev/null notmuch new 2>/dev/null From 55f810ef6939d5aecd3bfb8a10b62c21ee484d23 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 25 May 2020 21:02:53 -0400 Subject: [PATCH 51/73] minor tweaks --- bin/openfile | 2 +- share/mailcap | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/bin/openfile b/bin/openfile index c0e2e9c..f6668dc 100755 --- a/bin/openfile +++ b/bin/openfile @@ -1,7 +1,7 @@ #!/bin/sh # Helps open a file with xdg-open from mutt in a external program without weird side effects. -[ $(uname) = "Darwin" ] && opener="open" || opener="setsid xdg-open" +[ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid xdg-open" mkdir -p "/tmp/$USER-mutt-tmp" file="/tmp/$USER-mutt-tmp/$(basename "$1")" rm -f "$file" diff --git a/share/mailcap b/share/mailcap index f7a7541..5bd2471 100644 --- a/share/mailcap +++ b/share/mailcap @@ -5,3 +5,4 @@ image/*; openfile %s ; video/*; setsid mpv --quiet %s &; copiousoutput application/pdf; openfile %s ; application/pgp-encrypted; gpg -d '%s'; copiousoutput; +application/pgp-keys; gpg --import '%s'; copiousoutput; From e69a7ad311e94c29a1e4b7e593a8630b09573ea2 Mon Sep 17 00:00:00 2001 From: alps2006 Date: Wed, 27 May 2020 10:02:20 +0800 Subject: [PATCH 52/73] Fix head: illegal line count -- -1 (#443) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Fix head: illegal line count -- -1 * Fix `osascript: display notification with title "📧 xxxx" subtitle "xxxx" : No such file or directory` --- bin/mailsync | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index 3104c65..6aeb946 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -21,7 +21,7 @@ export DISPLAY=:0.0 # Settings are different for MacOS (Darwin) systems. if [ "$(uname)" = "Darwin" ]; then notify() { osascript -e "display notification \"$2 in $1\" with title \"You've got Mail\" subtitle \"Account: $account\"" && sleep 2 ;} - messageinfo() { osascript "display notification with title \"📧 $from\" subtitle \"$subject\"" ;} + messageinfo() { osascript -e "display notification with title \"📧 $from\" subtitle \"$subject\"" ;} else notify() { notify-send --app-name="mutt-wizard" "mutt-wizard" "📬 $2 new mail(s) in \`$1\` account." ;} messageinfo() { notify-send --app-name="mutt-wizard" "📧$from:" "$subject" ;} @@ -38,7 +38,7 @@ syncandnotify() { for file in $new; do # Extract subject and sender from mail. from=$(awk '/^From: / && ++n ==1,/^\<.*\>:/' "$file" | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | awk '{ $1=""; if (NF>=3)$NF=""; print $0 }' | sed 's/^[[:blank:]]*[\"'\''\<]*//;s/[\"'\''\>]*[[:blank:]]*$//') - subject=$(awk '/^Subject: / && ++n == 1,/^\<.*\>: / && ++i == 2' "$file" | head -n-1 | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | sed 's/^Subject: //' | sed 's/^{[[:blank:]]*[\"'\''\<]*//;s/[\"'\''\>]*[[:blank:]]*$//' | tr -d '\n') + subject=$(awk '/^Subject: / && ++n == 1,/^\<.*\>: / && ++i == 2' "$file" | head -n 1 | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | sed 's/^Subject: //' | sed 's/^{[[:blank:]]*[\"'\''\<]*//;s/[\"'\''\>]*[[:blank:]]*$//' | tr -d '\n') messageinfo & done fi From 12e37fce3c07edfbfb8b3d3049f4710b3bb6a13c Mon Sep 17 00:00:00 2001 From: qorg11 Date: Sun, 31 May 2020 12:22:00 +0200 Subject: [PATCH 53/73] Added pgp (gpg) support by default (#447) * mutt-wizard works on FreeBSD, also changed mbsync with isync (actual package name) * Added pgp support --- README.md | 2 +- bin/mw | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index fc0b51a..0123fba 100644 --- a/README.md +++ b/README.md @@ -112,5 +112,5 @@ mutt-wizard is free/libre software, licensed under the GPLv3. ## To-do -- Add ~~Mac OS~~/BSD compatibility (the script is confired to work for Mac OS now) +- Add ~~Mac OS~~/~~BSD~~ compatibility (the script is confired to work for Mac OS and FreeBSD now) - ~~Out-of-the-box compatibility with Protonmail Bridge~~ (I believe this is done, but more bug-testing is welcome since I don't have PM) diff --git a/bin/mw b/bin/mw index 981f3d2..e62be2a 100755 --- a/bin/mw +++ b/bin/mw @@ -7,7 +7,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init \`.\\nIf you don't have a GPG public private key pair, run \`%s --full-gen-key\` first.\\n" "$GPG" exit } -! command -v mbsync >/dev/null && printf "\`mbsync\` must be installed to run mutt-wizard.\\n" && exit +! command -v mbsync >/dev/null && printf "\`mbsync (isync package)\` must be installed to run mutt-wizard.\\n" && exit prefix="/usr/local" muttdir="$HOME/.config/mutt" # Main mutt config location @@ -86,6 +86,9 @@ set folder = \"$maildir/$title\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set mbox_type = Maildir +set crypt_opportunistic_encrypt = yes +set pgp_self_encrypt = yes +set pgp_default_key = $keyid bind index,pager gg noop bind index,pager g noop @@ -108,6 +111,11 @@ set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set imap_pass = \"\`pass mutt-wizard-$title\`\" +set crypt_opportunistic_encrypt = yes +set pgp_self_encrypt = yes +set pgp_default_key = $keyid + + set mbox_type = Maildir set ssl_starttls = yes set ssl_force_tls = yes @@ -126,6 +134,7 @@ fi askinfo() { \ printf "Insert the \033[31memail address\033[0m that you want to autoconfigure for mutt/mbsync\\n\tEmail: \033[36m" read -r fulladdr + keyid=$( gpg --list-keys --with-colons $fulladdr | awk -F: '/^pub:/ { print $5 }') printf "\033[0m" while ! echo "$fulladdr" | grep "$emailre" >/dev/null; do printf "That is not a valid \033[31memail address\033[0m, please retype the desired email.\\n\\nEmail: \033[36m\t" From 7c41c5e1e65d4f90bf2cdfebd51235d747807b5b Mon Sep 17 00:00:00 2001 From: JameyBear Date: Sun, 31 May 2020 07:16:56 -0400 Subject: [PATCH 54/73] Simple Fixes (#448) --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0123fba..8681f8d 100644 --- a/README.md +++ b/README.md @@ -3,13 +3,13 @@ Get this great stuff without effort: - A full-featured and autoconfigured email client on the terminal with neomutt -- Mail stored offline so you can view and write email while away from internet and keep backups +- Mail stored offline so you can view and write email while you're away from internet and keep backups Specifically, this wizard: - Determines your email server's IMAP and SMTP servers and ports - Creates dotfiles for `neomutt`, `isync`, and `msmtp` appropriate for your email address -- Encrypts and stores locally your password for easy remote access, accessible only by your GPG key +- Encrypts and locally stores your password for easy remote access, accessible only by your GPG key - Handles as many as nine separate email accounts automatically - Auto-creates bindings to switch between accounts or between mailboxes - Can automatically set mail updates as often as you want to sync your mail and update you when new mail arrives @@ -112,5 +112,5 @@ mutt-wizard is free/libre software, licensed under the GPLv3. ## To-do -- Add ~~Mac OS~~/~~BSD~~ compatibility (the script is confired to work for Mac OS and FreeBSD now) +- Add ~~Mac OS~~/~~BSD~~ compatibility (the script is confirmed to work for Mac OS and FreeBSD now) - ~~Out-of-the-box compatibility with Protonmail Bridge~~ (I believe this is done, but more bug-testing is welcome since I don't have PM) From bb72cf5a71418a3d8eaa3cc731a2b8a8627e9c1c Mon Sep 17 00:00:00 2001 From: JameyBear Date: Sun, 31 May 2020 12:10:35 -0400 Subject: [PATCH 55/73] Cleanup (#450) * Simple Fixes * Tweak wording * Update openfile * ShellChecked * Little Fixes --- bin/mailsync | 4 ++-- bin/mw | 8 ++++---- bin/openfile | 2 +- mw.1 | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/mailsync b/bin/mailsync index 6aeb946..6128f41 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -12,7 +12,7 @@ ping -q -c 1 1.1.1.1 > /dev/null || { echo "No internet connection detected."; e command -v notify-send >/dev/null || echo "Note that \`libnotify\` or \`libnotify-send\` should be installed for pop-up mail notifications with this script." # Required to display notifications if run as a cronjob: -DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus +export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus export DISPLAY=:0.0 # For individual configurations: @@ -30,7 +30,7 @@ fi # Check account for new mail. Notify if there is new content. syncandnotify() { acc="$(echo "$account" | sed "s/.*\///")" - mbsync $opts "$acc" + mbsync "$opts" "$acc" new=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" "$HOME/.local/share/mail/$acc/Inbox/new/" "$HOME/.local/share/mail/$acc/inbox/new/" -type f -newer "$HOME/.config/mutt/.mailsynclastrun" 2> /dev/null) newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l) if [ "$newcount" -gt "0" ]; then diff --git a/bin/mw b/bin/mw index e62be2a..0862f30 100755 --- a/bin/mw +++ b/bin/mw @@ -3,7 +3,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" [ -z ${PASSWORD_STORE_DIR+x} ] && PASSWORD_STORE_DIR="$HOME/.password-store" [ -r "$PASSWORD_STORE_DIR/.gpg-id" ] && - "$GPG" --list-secret-keys $(cat "$PASSWORD_STORE_DIR/.gpg-id") >/dev/null 2>&1 || { + "$GPG" --list-secret-keys "$(cat "$PASSWORD_STORE_DIR/.gpg-id")" >/dev/null 2>&1 || { printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init \`.\\nIf you don't have a GPG public private key pair, run \`%s --full-gen-key\` first.\\n" "$GPG" exit } @@ -134,7 +134,7 @@ fi askinfo() { \ printf "Insert the \033[31memail address\033[0m that you want to autoconfigure for mutt/mbsync\\n\tEmail: \033[36m" read -r fulladdr - keyid=$( gpg --list-keys --with-colons $fulladdr | awk -F: '/^pub:/ { print $5 }') + keyid=$( gpg --list-keys --with-colons "$fulladdr" | awk -F: '/^pub:/ { print $5 }') printf "\033[0m" while ! echo "$fulladdr" | grep "$emailre" >/dev/null; do printf "That is not a valid \033[31memail address\033[0m, please retype the desired email.\\n\\nEmail: \033[36m\t" @@ -145,7 +145,7 @@ askinfo() { \ search_query=$domain case "$domain" in protonmail.com|protonmail.ch|pm.me) - search_query='protonmail.com' && break;; + search_query='protonmail.com' && return 1;; *) while : ; do printf "\nIs your email hosted with Protonmail? [yes/no] " @@ -339,7 +339,7 @@ synchronize_flags=true gpg_path=$GPG" echo "$nmbasic" > "$NOTMUCH_CONFIG" ;} -trap 'echo -e "\033[0m\n"; exit' STOP INT ABRT KILL +trap 'echo -e "\033[0m\n"; exit' INT ABRT case "$1" in ls) list ;; diff --git a/bin/openfile b/bin/openfile index c0e2e9c..f6668dc 100755 --- a/bin/openfile +++ b/bin/openfile @@ -1,7 +1,7 @@ #!/bin/sh # Helps open a file with xdg-open from mutt in a external program without weird side effects. -[ $(uname) = "Darwin" ] && opener="open" || opener="setsid xdg-open" +[ "$(uname)" = "Darwin" ] && opener="open" || opener="setsid xdg-open" mkdir -p "/tmp/$USER-mutt-tmp" file="/tmp/$USER-mutt-tmp/$(basename "$1")" rm -f "$file" diff --git a/mw.1 b/mw.1 index c866c83..217ae2b 100644 --- a/mw.1 +++ b/mw.1 @@ -6,7 +6,7 @@ mw \- mutt-wizard \- autoconfigure email accounts for neomutt and isync .SH DESCRIPTION .B mw -takes a user email account and sets up a terminal-based email interface with it for +takes a user email account and sets up a terminal-based email interface for it with .B neomutt. This can include offline email with .B isync/mbsync From 591145b653dbbe1effa2eb8cf4e4e53a8e51e880 Mon Sep 17 00:00:00 2001 From: qorg11 Date: Mon, 1 Jun 2020 13:45:20 +0200 Subject: [PATCH 56/73] Auto sign emails using pgp (#451) --- bin/mw | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/mw b/bin/mw index 0862f30..ed4f278 100755 --- a/bin/mw +++ b/bin/mw @@ -86,6 +86,8 @@ set folder = \"$maildir/$title\" set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set mbox_type = Maildir + +set crypt_autosign = yes set crypt_opportunistic_encrypt = yes set pgp_self_encrypt = yes set pgp_default_key = $keyid @@ -111,6 +113,7 @@ set header_cache = $cachedir/$title/headers set message_cachedir = $cachedir/$title/bodies set imap_pass = \"\`pass mutt-wizard-$title\`\" +set crypt_autosign = yes set crypt_opportunistic_encrypt = yes set pgp_self_encrypt = yes set pgp_default_key = $keyid From 5b278c94a8122c7c576f48c6f3a80eab0928a395 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 2 Jun 2020 15:24:37 -0400 Subject: [PATCH 57/73] funding file for github sponsors --- FUNDING.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 FUNDING.yml diff --git a/FUNDING.yml b/FUNDING.yml new file mode 100644 index 0000000..5b856dc --- /dev/null +++ b/FUNDING.yml @@ -0,0 +1,5 @@ +github: lukesmithxyz +custom: "https://lukesmith.xyz/donate" +custom: "https://paypal.me/lukemsmith" +patreon: lukesmith +custom: "https://lukesmith.xyz/crypto" From bc3ea20a0605c38a076d129702a80e1892c99145 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Tue, 2 Jun 2020 15:41:16 -0400 Subject: [PATCH 58/73] ui fix --- FUNDING.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/FUNDING.yml b/FUNDING.yml index 5b856dc..f8e6076 100644 --- a/FUNDING.yml +++ b/FUNDING.yml @@ -1,5 +1,3 @@ github: lukesmithxyz -custom: "https://lukesmith.xyz/donate" -custom: "https://paypal.me/lukemsmith" +custom: ["https://lukesmith.xyz/donate", "https://paypal.me/lukemsmith", "https://lukesmith.xyz/crypto"] patreon: lukesmith -custom: "https://lukesmith.xyz/crypto" From d90b668d4e2d37295022ddcbaa9536a4bbbfe16d Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Thu, 4 Jun 2020 18:47:13 -0400 Subject: [PATCH 59/73] fix #452 --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index ed4f278..1d7ed07 100755 --- a/bin/mw +++ b/bin/mw @@ -137,7 +137,7 @@ fi askinfo() { \ printf "Insert the \033[31memail address\033[0m that you want to autoconfigure for mutt/mbsync\\n\tEmail: \033[36m" read -r fulladdr - keyid=$( gpg --list-keys --with-colons "$fulladdr" | awk -F: '/^pub:/ { print $5 }') + keyid=$("$GPG" --list-keys --with-colons "$fulladdr" | awk -F: '/^pub:/ { print $5 }') printf "\033[0m" while ! echo "$fulladdr" | grep "$emailre" >/dev/null; do printf "That is not a valid \033[31memail address\033[0m, please retype the desired email.\\n\\nEmail: \033[36m\t" From 86b2d78f0b3386ca15a21ef3931a69fac09e5b20 Mon Sep 17 00:00:00 2001 From: alps2006 Date: Sun, 7 Jun 2020 04:50:40 +0800 Subject: [PATCH 60/73] Improved key mapping that can quickly selected item with in query mode (abook) (#446) --- 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 3dd2f6c..aafb3d5 100644 --- a/share/mutt-wizard.muttrc +++ b/share/mutt-wizard.muttrc @@ -46,7 +46,7 @@ bind index U undelete-message bind index L limit bind index h noop bind index l display-message -bind index tag-entry +bind index,query tag-entry #bind browser h goto-parent macro browser h '..' "Go to parent folder" bind index,pager H view-raw-message From c25bac2cf9c70a25a3ff3182f6a0f0bd11bf2276 Mon Sep 17 00:00:00 2001 From: Petrus Date: Sun, 7 Jun 2020 04:51:49 +0800 Subject: [PATCH 61/73] make crontab quite (#416) Let's make crontab a little quiet here, unless for those who set up mail for crontab error handling will be disturbed every few minutes. --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 1d7ed07..5293c5d 100755 --- a/bin/mw +++ b/bin/mw @@ -303,7 +303,7 @@ choosecron() { ! pgrep cron >/dev/null && echo "No cron manager running. Install read -r minnum printf "\033[0m" done - (crontab -l; echo "*/$minnum * * * * $(type mailsync | cut -d' ' -f3)") | crontab - && + (crontab -l; echo "*/$minnum * * * * $(type mailsync | cut -d' ' -f3)") >/dev/null | crontab - && echo "Cronjob added. Mail will sync every $minnum minutes. Be sure you have your cron manager running." fi ;} From 14d73009953c22d66e2cdf0dbc0ba33351206568 Mon Sep 17 00:00:00 2001 From: Luke Bubar <43391582+lukerb52@users.noreply.github.com> Date: Sat, 6 Jun 2020 16:54:35 -0400 Subject: [PATCH 62/73] Update domains.csv (#400) Co-authored-by: Luke Smith --- share/domains.csv | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/domains.csv b/share/domains.csv index 04926d5..3f0eb21 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -89,6 +89,7 @@ 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 getbackinthe.kitchen,mail.cock.li,993,mail.cock.li,587 +gcc.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 gmail.com,imap.gmail.com,993,smtp.gmail.com,587 gmx.at,imap.gmx.net,993,mail.gmx.net,587 gmx.com,imap.gmx.net,993,mail.gmx.net,587 @@ -308,4 +309,4 @@ ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465 unilodz.eu,outlook.office365.com,993,smtp.office365.com,587 ethz.ch,mail.ethz.ch,993,mail.ethz.ch,587 bocken.org,imap.gmail.com,993,smtp.gmail.com,465 -vxempire.xyz,vxempire.xyz,993,vxempire.xyz,587 +vxempire.xyz,vxempire.xyz,993,vxempire.xyz,587 \ No newline at end of file From 9ec2a49af03cf542c7db82bc0dd0ccdde81922d4 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Sat, 6 Jun 2020 16:56:13 -0400 Subject: [PATCH 63/73] i wish people would do this themselves in prs --- share/domains.csv | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/share/domains.csv b/share/domains.csv index 3f0eb21..a1d4d3c 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -33,6 +33,7 @@ bikerider.com,imap.mail.com,993,smtp.mail.com,587 billycarlyle.uk,mail.muny.us,993,mail.muny.us,465 birdlover.com,imap.mail.com,993,smtp.mail.com,587 bjoernguthphotography.de,wp300.webpack.hosteurope.de,993,wp300.webpack.hosteurope.de,587 +bocken.org,imap.gmail.com,993,smtp.gmail.com,465 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 @@ -79,6 +80,7 @@ eneco.com,outlook.office365.com,993,smtp.office365.com,587 engineer.com,imap.mail.com,993,smtp.mail.com,587 erciyes.edu.tr,posta.erciyes.edu.tr,993,smtp.erciyes.edu.tr,587 ethancoe.com,mail.privateemail.com,993,mail.privateemail.com,465 +ethz.ch,mail.ethz.ch,993,mail.ethz.ch,587 etu.upmc.fr,courriel.upmc.fr,993,smtps.upmc.fr,587 europe.com,imap.mail.com,993,smtp.mail.com,587 fastmail.com,imap.fastmail.com,993,smtp.fastmail.com,465 @@ -88,8 +90,8 @@ 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 -getbackinthe.kitchen,mail.cock.li,993,mail.cock.li,587 gcc.edu,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 +getbackinthe.kitchen,mail.cock.li,993,mail.cock.li,587 gmail.com,imap.gmail.com,993,smtp.gmail.com,587 gmx.at,imap.gmx.net,993,mail.gmx.net,587 gmx.com,imap.gmx.net,993,mail.gmx.net,587 @@ -271,6 +273,7 @@ ua.pt,outlook.office365.com,993,mail.ua.pt,25 uach.mx,imap.gmail.com,993,smtp.gmail.com,587 ucdavis.edu,imap.gmail.com,993,smtp.gmail.com,587 uni-duesseldorf.de,mail.hhu.de,993,mail.hhu.de,465 +unilodz.eu,outlook.office365.com,993,smtp.office365.com,587 unitybox.de,mail.unity-mail.de,993,mail.unity-mail.de,587 uoregon.edu,imap.uoregon.edu,993,smtp.uoregon.edu,587 uqtr.ca,outlook.office365.com,993,smtp.office365.com,587 @@ -284,6 +287,7 @@ vip.onet.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 vivaldi.net,imap.vivaldi.net,993,smtp.vivaldi.net,587 vp.pl,imap.poczta.onet.pl,993,smtp.poczta.onet.pl,465 vt.edu,imap.gmail.com,993,smtp.gmail.com,587 +vxempire.xyz,vxempire.xyz,993,vxempire.xyz,587 waifu.club,mail.cock.li,993,mail.cock.li,587 wanadoo.fr,imap.orange.fr,993,smtp.orange.fr,465 wants.dicksinhisan.us,mail.cock.li,993,mail.cock.li,587 @@ -302,11 +306,7 @@ yandex.kz,imap.yandex.com,993,smtp.yandex.com,587 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 +ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465 zaclys.net,mail.zaclys.net,993,mail.zaclys.net,465 zoho.com,imap.zoho.com,993,smtp.zoho.com,465 zohomail.eu,imap.zoho.eu,993,smtp.zoho.eu,465 -ymail.com,imap.mail.yahoo.com,993,smtp.mail.yahoo.com,465 -unilodz.eu,outlook.office365.com,993,smtp.office365.com,587 -ethz.ch,mail.ethz.ch,993,mail.ethz.ch,587 -bocken.org,imap.gmail.com,993,smtp.gmail.com,465 -vxempire.xyz,vxempire.xyz,993,vxempire.xyz,587 \ No newline at end of file From 97708ce11eff2c145c551d391cbf4d5ee3f85c10 Mon Sep 17 00:00:00 2001 From: Rob Date: Mon, 8 Jun 2020 12:16:20 +0100 Subject: [PATCH 64/73] fix blank opt flag (#454) If no options are passed but the accounts are specified then the blank opt flag causes a (harmless) error message from mbsync about an empy channel. Co-authored-by: rjl6789 --- bin/mailsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mailsync b/bin/mailsync index a90c6c9..4050eba 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -30,7 +30,7 @@ fi # Check account for new mail. Notify if there is new content. syncandnotify() { acc="$(echo "$account" | sed "s/.*\///")" - mbsync "$opts" "$acc" + if [ -z "$opts" ]; then mbsync "$acc"; else mbsync "$opts" "$acc"; fi new=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" "$HOME/.local/share/mail/$acc/Inbox/new/" "$HOME/.local/share/mail/$acc/inbox/new/" -type f -newer "$HOME/.config/mutt/.mailsynclastrun" 2> /dev/null) newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l) if [ "$newcount" -gt "0" ]; then From 76417d7b071b4a82338eb81ff835de2c070ea104 Mon Sep 17 00:00:00 2001 From: Rob Date: Tue, 9 Jun 2020 13:41:38 +0100 Subject: [PATCH 65/73] fix crontab set (#457) I think a recent change tried to send output from crontab to dev/null to avoid messages appearing a) when setting the crontab, b) whenever mailsync is run. However the redirection was for the string concatenation meaning a null string was piped to cron obliterating the crontab (thank goodness for backups). I have put the redirection in the correct location (similar to a few lines above when removing the mailsync line). I have also redirected all output of the mailsync (both errors and normal messages) to dev null. Co-authored-by: rjl6789 --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 5293c5d..1d986d1 100755 --- a/bin/mw +++ b/bin/mw @@ -303,7 +303,7 @@ choosecron() { ! pgrep cron >/dev/null && echo "No cron manager running. Install read -r minnum printf "\033[0m" done - (crontab -l; echo "*/$minnum * * * * $(type mailsync | cut -d' ' -f3)") >/dev/null | crontab - && + (crontab -l; echo "*/$minnum * * * * $(type mailsync | cut -d' ' -f3) >/dev/null 2>&1") | crontab - >/dev/null && echo "Cronjob added. Mail will sync every $minnum minutes. Be sure you have your cron manager running." fi ;} From cbf2f14d0d8a328188a3811cca749d381a80e2a6 Mon Sep 17 00:00:00 2001 From: Elijah Gregg Date: Wed, 10 Jun 2020 19:48:16 +0000 Subject: [PATCH 66/73] Update domains.csv (#461) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update domains.csv * Update domains.csv * Update domains.csv Forgot to alphabetize, whoops🙄 --- share/domains.csv | 2 ++ 1 file changed, 2 insertions(+) diff --git a/share/domains.csv b/share/domains.csv index a1d4d3c..b34f3ae 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -236,6 +236,7 @@ rape.lol,mail.cock.li,993,mail.cock.li,587 redchan.it,mail.cock.li,993,mail.cock.li,587 resch.pw,mail.resch.pw,993,mail.resch.pw,587 riseup.net,mail.riseup.net,993,mail.riseup.net,465 +rmcacs.org,imap.gmail.com,993,smtp.gmail.com,587 runbox.com,mail.runbox.com,993,mail.runbox.com,587 rwth-aachen.de,mail.rwth-aachen.de,993,mail.rwth-aachen.de,587 sapo.pt,imap.sapo.pt,993,smtp.sapo.pt,587 @@ -251,6 +252,7 @@ stud.uni-bamberg.de,outlook.office365.com,993,smtp.office365.com,587 student.rmit.edu.au,outlook.office365.com,993,smtp.office365.com,587 student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 studenti.unipi.it,outlook.office365.com,993,smtp.office365.com,587 +students.rmcacs.org,imap.gmail.com,993,smtp.gmail.com,587 students.southwales.ac.uk,imap.gmail.com,993,smtp.gmail.com,587 studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 studio.unibo.it,outlook.office365.com,993,smtp.office365.com,587 From ca5c623855133903521dedb1dca08373ba762948 Mon Sep 17 00:00:00 2001 From: Rob Date: Fri, 12 Jun 2020 11:43:26 +0100 Subject: [PATCH 67/73] fix premature return from askinfo (#463) I believe this addresses issue #456 where if you add a protonmail account you get an error. This is caused by prematurely returning from the case statement that queries whether you have a protonmail account or not. Co-authored-by: rjl6789 --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index 1d986d1..c7a5c62 100755 --- a/bin/mw +++ b/bin/mw @@ -148,7 +148,7 @@ askinfo() { \ search_query=$domain case "$domain" in protonmail.com|protonmail.ch|pm.me) - search_query='protonmail.com' && return 1;; + search_query='protonmail.com' ;; *) while : ; do printf "\nIs your email hosted with Protonmail? [yes/no] " From 5d5e61295305e03f60e81ddf87931da8da14cd8b Mon Sep 17 00:00:00 2001 From: Neil <41444780+Neveon@users.noreply.github.com> Date: Sat, 13 Jun 2020 07:55:19 -0400 Subject: [PATCH 68/73] Update domains.csv (#464) Added my schools server info --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index b34f3ae..2c0c3e7 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -167,6 +167,7 @@ interia.pl,poczta.interia.pl,993,poczta.interia.pl,465 inventati.org,mail.autistici.org,993,smtp.autistici.org,465 ionos.de,imap.ionos.de,993,smtp.ionos.de,587 itu.dk,imap-mail.outlook.com,993,smtp-mail.outlook.com,587 +kean.edu,imap.gmail.com,993,smtp.gmail.com,587 kipras.org,mail.kipras.org,993,mail.kipras.org,587 krutt.org,mail.autistici.org,993,smtp.autistici.org,465 kth.se,webmail.kth.se,993,smtp.kth.se,587 From 040bcedbc5dc063957833d9940ffead11f32da29 Mon Sep 17 00:00:00 2001 From: Carlos de la Torre <48769508+c-torre@users.noreply.github.com> Date: Sat, 13 Jun 2020 14:28:54 +0000 Subject: [PATCH 69/73] added university of helsinki (#465) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 2c0c3e7..86bb5e8 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -108,6 +108,7 @@ grrlz.net,mail.autistici.org,993,smtp.autistici.org,465 hacari.com,mail.autistici.org,993,smtp.autistici.org,465 hacari.net,mail.autistici.org,993,smtp.autistici.org,465 hacari.org,mail.autistici.org,993,smtp.autistici.org,465 +helsinki.fi,outlook.office365.com,993,smtp.helsinki.fi,587 hhu.de,mail.hhu.de,993,mail.hhu.de,465 hitler.rocks,mail.cock.li,993,mail.cock.li,587 horsefucker.org,mail.cock.li,993,mail.cock.li,587 From 5e2aa207a029783de72e692b4fb55a1576677ead Mon Sep 17 00:00:00 2001 From: AAP <46041660+null2264@users.noreply.github.com> Date: Sun, 14 Jun 2020 19:48:41 +0700 Subject: [PATCH 70/73] + Added binadarma (Universitas Binadarma) (#466) --- share/domains.csv | 1 + 1 file changed, 1 insertion(+) diff --git a/share/domains.csv b/share/domains.csv index 86bb5e8..5ba77b0 100644 --- a/share/domains.csv +++ b/share/domains.csv @@ -251,6 +251,7 @@ 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 stud.uni-bamberg.de,outlook.office365.com,993,smtp.office365.com,587 +student.binadarma.ac.id,imap.gmail.com,993,smtp.gmail.com,587 student.rmit.edu.au,outlook.office365.com,993,smtp.office365.com,587 student.tuwien.ac.at,mail.student.tuwien.ac.at,993,mail.student.tuwien.ac.at,587 studenti.unipi.it,outlook.office365.com,993,smtp.office365.com,587 From 44ea78692908d7aa54d2e1ed20314343c8db198a Mon Sep 17 00:00:00 2001 From: Michel Boaventura Date: Tue, 16 Jun 2020 16:07:28 -0300 Subject: [PATCH 71/73] Update Makefile (#458) Fix uninstall command --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6633b7b..70f780d 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,7 @@ install: uninstall: for script in bin/*; do \ - rm -f $(DESTDIR)$(PREFIX)/$$script; \ + rm -f $(DESTDIR)$(PREFIX)/bin/$$script; \ done rm -rf $(DESTDIR)$(PREFIX)/share/mutt-wizard rm -f $(DESTDIR)$(MANPREFIX)/man1/mw.1 From e2203ed34f5f74b1d7b4651f35feaa86426bd087 Mon Sep 17 00:00:00 2001 From: CosmosAtlas Date: Wed, 17 Jun 2020 03:10:35 +0800 Subject: [PATCH 72/73] changed ping address to a more friendly location (#399) * changed ping address to a more friendly location `1.1.1.1` is not a friendly address for users from some parts of the world (e.g., China). Changed to `example.org` which should be more friendly to access. * changed internet check by fallback This is probably better since for most people it does the same thing and the first back up is Cloudfare's other DNS address which surprisingly can be accessed in more places (e.g., China) now. And changed the finall fallback as example.org. --- bin/mailsync | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mailsync b/bin/mailsync index 4050eba..93ec35d 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -8,7 +8,7 @@ pgrep -u "${USER:=$LOGNAME}" >/dev/null || { echo "$USER not logged in; sync wil pgrep -x mbsync >/dev/null && { echo "mbsync is already running." ; exit ;} # Checks for internet connection and set notification script. -ping -q -c 1 1.1.1.1 > /dev/null || { echo "No internet connection detected."; exit ;} +ping -q -c 1 1.1.1.1 > /dev/null || ping -q -c 1 1.0.0.1 > /dev/null || ping -q -c 1 example.org || { echo "No internet connection detected."; exit ;} command -v notify-send >/dev/null || echo "Note that \`libnotify\` or \`libnotify-send\` should be installed for pop-up mail notifications with this script." # Required to display notifications if run as a cronjob: From 497839b1ee804d86f9dac453108c7bbf071060ee Mon Sep 17 00:00:00 2001 From: Fraser Li <55525214+fraserli@users.noreply.github.com> Date: Mon, 22 Jun 2020 21:41:07 +1000 Subject: [PATCH 73/73] Added support for multiple gpg keys with pass (#472) --- bin/mw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/mw b/bin/mw index c7a5c62..9bf00c3 100755 --- a/bin/mw +++ b/bin/mw @@ -3,7 +3,7 @@ command -V gpg >/dev/null 2>&1 && GPG="gpg" || GPG="gpg2" [ -z ${PASSWORD_STORE_DIR+x} ] && PASSWORD_STORE_DIR="$HOME/.password-store" [ -r "$PASSWORD_STORE_DIR/.gpg-id" ] && - "$GPG" --list-secret-keys "$(cat "$PASSWORD_STORE_DIR/.gpg-id")" >/dev/null 2>&1 || { + "$GPG" --list-secret-keys $(cat "$PASSWORD_STORE_DIR/.gpg-id") >/dev/null 2>&1 || { printf "\`pass\` must be installed and initialized to encrypt passwords.\\nBe sure it is installed and run \`pass init \`.\\nIf you don't have a GPG public private key pair, run \`%s --full-gen-key\` first.\\n" "$GPG" exit }