From 718e586f4a8b6b097f0817fb0ac439a9a2650ca3 Mon Sep 17 00:00:00 2001
From: Francesco Minnocci <ad17fmin@uwcad.it>
Date: Sat, 23 Jan 2021 11:38:04 +0100
Subject: [PATCH] mailsync: Check for ZDOTDIR when looking for environmental
 variables inside .zprofile and .zshrc.

~/.profile is not necessarily present when using zsh for login and
setting $ZDOTDIR in ~/.zshenv
---
 bin/mailsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/mailsync b/bin/mailsync
index ecac6af..42cd4e0 100755
--- a/bin/mailsync
+++ b/bin/mailsync
@@ -22,7 +22,7 @@ pgrep -x mbsync >/dev/null && { echo "mbsync is already running." ; exit ;}
 # will work on the maximum number of machines.
 eval "$(grep -h -- \
 	"^\s*\(export \)\?\(MBSYNCRC\|PASSWORD_STORE_DIR\|NOTMUCH_CONFIG\|GNUPGHOME\)=" \
-	"$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.pam_environment" 2>/dev/null)"
+	"$HOME/.profile" "$HOME/.bash_profile" "${ZDOTDIR:-$HOME}/.zprofile" "$HOME/.bashrc" "${ZDOTDIR:-$HOME}/.zshrc" "$HOME/.pam_environment" 2>/dev/null)"
 # One alternative to this kind of command would be marking the script for
 # /bin/sh -l. That might cause other problems on other particular setups that
 # do more complicated things on login, or those people who assign environmental