diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2021-01-23 08:17:40 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-23 08:17:40 -0500 |
| commit | 3bd61cbc9753f43765f5c866a53437a0d60e4f8f (patch) | |
| tree | 6d43c91b0806dcbd2ff39a8963d3376c4c5c35af /bin | |
| parent | 1404bca4623b5ec10c33915786060bce5b3193c9 (diff) | |
| parent | 718e586f4a8b6b097f0817fb0ac439a9a2650ca3 (diff) | |
Merge pull request #637 from BachoSeven/master
mailsync: Check for ZDOTDIR when looking for environmental variables inside .zprofile and .zshrc
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/mailsync | 2 |
1 files changed, 1 insertions, 1 deletions
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 |