Browse Source

Merge pull request #637 from BachoSeven/master

mailsync: Check for ZDOTDIR when looking for environmental variables inside .zprofile and .zshrc
tags/3.2.1
Luke Smith 3 years ago
committed by GitHub
parent
commit
3bd61cbc97
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      bin/mailsync

+ 1
- 1
bin/mailsync View File

@@ -22,7 +22,7 @@ pgrep -x mbsync >/dev/null && { echo "mbsync is already running." ; exit ;}
# will work on the maximum number of machines. # will work on the maximum number of machines.
eval "$(grep -h -- \ eval "$(grep -h -- \
"^\s*\(export \)\?\(MBSYNCRC\|PASSWORD_STORE_DIR\|NOTMUCH_CONFIG\|GNUPGHOME\)=" \ "^\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 # 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 # /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 # do more complicated things on login, or those people who assign environmental


Loading…
Cancel
Save