mutt-wizard

fork of Luke Smiths mutt-wizard
git clone git://git.jakekoroman.com/mutt-wizard
Log | Files | Refs | README | LICENSE

commit 3bd61cbc9753f43765f5c866a53437a0d60e4f8f
parent 1404bca4623b5ec10c33915786060bce5b3193c9
Author: Luke Smith <luke@lukesmith.xyz>
Date:   Sat, 23 Jan 2021 08:17:40 -0500

Merge pull request #637 from BachoSeven/master

mailsync: Check for ZDOTDIR when looking for environmental variables inside .zprofile and .zshrc
Diffstat:
Mbin/mailsync | 2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 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