commit 203fa4f68eda843098f65f7ccd03caedf8231878
parent fff2625e77064e639278bcb611ac11ab7fa03126
Author: Luke Smith <luke@lukesmith.xyz>
Date: Thu, 25 Feb 2021 12:25:15 -0500
Merge branch 'Kr1ss-XD-fix-661'
Diffstat:
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/FUNDING.yml b/FUNDING.yml
@@ -1,3 +1,2 @@
+custom: ["https://lukesmith.xyz/donate.html"]
github: lukesmithxyz
-custom: ["https://lukesmith.xyz/donate", "https://paypal.me/lukemsmith"]
-patreon: lukesmith
diff --git a/bin/mailsync b/bin/mailsync
@@ -39,12 +39,14 @@ case "$(uname)" in
messageinfo() { osascript -e "display notification with title \"📧 $from\" subtitle \"$subject\"" ;}
;;
*)
- displays="$(pgrep -a X\(org\|wayland\) | grep -wo "[0-9]*:[0-9]\+" | sort -u)"
- notify() { for x in $displays; do
+ # remember if a display server is running since `ps` doesn't always contain a display
+ pgrepoutput="$(pgrep -a X\(org\|wayland\))"
+ displays="$(echo "$pgrepoutput" | grep -wo "[0-9]*:[0-9]\+" | sort -u)"
+ notify() { [ -n "$pgrepoutput" ] && for x in ${displays:-0:}; do
export DISPLAY=$x
notify-send --app-name="mutt-wizard" "mutt-wizard" "📬 $2 new mail(s) in \`$1\` account."
done ;}
- messageinfo() { for x in $displays; do
+ messageinfo() { [ -n "$pgrepoutput" ] && for x in ${displays:-0:}; do
export DISPLAY=$x
notify-send --app-name="mutt-wizard" "📧$from:" "$subject"
done ;}
diff --git a/share/domains.csv b/share/domains.csv
@@ -124,6 +124,7 @@ 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
in.tum.de,mail.in.tum.de,993,mail.in.tum.de,465
+inbox.lv,mail.inbox.lv,993,mail.inbox.lv,465
iname.com,imap.mail.com,993,smtp.mail.com,587
inf.h-brs.de,imap.inf.h-brs.de,993,smtp.inf.h-brs.de,587
infomaniak.com,imap.infomaniak.com,993,imap.infomaniak.com,587
@@ -266,6 +267,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
ucdavis.edu,imap.gmail.com,993,smtp.gmail.com,587
+ucsb.edu,imap.gmail.com,993,smtp.gmail.com,587
uni-duesseldorf.de,mail.hhu.de,993,mail.hhu.de,465
uni-jena.de,imap.uni-jena.de,993,smtp.uni-jena.de,587
unilodz.eu,outlook.office365.com,993,smtp.office365.com,587