mutt-wizard

commit bf9aa99930503c0c686dc27414877cf4affe5e50
parent 4b30e06d05cd6112de84dafb7aa3c2a81b416e88
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Thu, 25 Feb 2021 12:21:35 -0500

Merge branch 'fix-661' of https://github.com/Kr1ss-XD/mutt-wizard into Kr1ss-XD-fix-661

Diffstat:
M
bin/mailsync
 | 
8
+++++---
M
share/domains.csv
 | 
1
+

2 files changed, 6 insertions(+), 3 deletions(-)
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
@@ -267,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