| @@ -14,7 +14,7 @@ | |||||
| # Run only if user logged in (prevent cron errors) | # Run only if user logged in (prevent cron errors) | ||||
| pgrep -u "${USER:=$LOGNAME}" >/dev/null || { echo "$USER not logged in; sync will not run."; exit ;} | pgrep -u "${USER:=$LOGNAME}" >/dev/null || { echo "$USER not logged in; sync will not run."; exit ;} | ||||
| # Run only if not already running in other instance | # Run only if not already running in other instance | ||||
| pidof mbsync >/dev/null && { echo "mbsync is already running."; exit ;} | |||||
| pgrep mbsync >/dev/null && { echo "mbsync is already running."; exit ;} | |||||
| # First, we have to get the right variables for the mbsync file, the pass | # First, we have to get the right variables for the mbsync file, the pass | ||||
| # archive, notmuch and the GPG home. This is done by searching common profile | # archive, notmuch and the GPG home. This is done by searching common profile | ||||
| @@ -25,7 +25,7 @@ eval "$(grep -h -- \ | |||||
| "$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.config/zsh/.zprofile" "$HOME/.zshenv" \ | "$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.config/zsh/.zprofile" "$HOME/.zshenv" \ | ||||
| "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" "$HOME/.pam_environment" 2>/dev/null)" | "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" "$HOME/.pam_environment" 2>/dev/null)" | ||||
| export GPG_TTY=$TTY | |||||
| export GPG_TTY="$(tty)" | |||||
| [ -n "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC" || MBSYNCRC="$HOME/.mbsyncrc" | [ -n "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC" || MBSYNCRC="$HOME/.mbsyncrc" | ||||