diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2021-01-24 19:14:44 -0500 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2021-01-24 19:14:44 -0500 |
| commit | 978cd4eb98e2e400b2010ff2f7476436b475d816 (patch) | |
| tree | 1f213b1454be60455eb8a82ff889d9452b41e53a | |
| parent | 039dec817e2f6f8a0ab3f886dfeeba4aecf2b2cf (diff) | |
for zdotdir changes; close #639
| -rwxr-xr-x | bin/mailsync | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/bin/mailsync b/bin/mailsync index 7bad83d..8ca83c6 100755 --- a/bin/mailsync +++ b/bin/mailsync @@ -22,19 +22,14 @@ 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" "${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 -# variables in shell rc files. + "$HOME/.profile" "$HOME/.bash_profile" "$HOME/.zprofile" "$HOME/.config/zsh/.zprofile" \ + "$HOME/.bashrc" "$HOME/.zshrc" "$HOME/.config/zsh/.zshrc" "$HOME/.pam_environment" 2>/dev/null)" case "$(readlink -f /sbin/init)" in *systemd*) export DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus ;; esac export GPG_TTY=$TTY -muttconfig="${XDG_CONFIG_HOME:-$HOME/.config}/mutt" - [ -n "$MBSYNCRC" ] && alias mbsync="mbsync -c $MBSYNCRC" || MBSYNCRC="$HOME/.mbsyncrc" # Settings are different for MacOS (Darwin) systems. @@ -60,7 +55,7 @@ esac syncandnotify() { acc="$(echo "$account" | sed "s/.*\///")" if [ -z "$opts" ]; then mbsync "$acc"; else mbsync "$opts" "$acc"; fi - new=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" "$HOME/.local/share/mail/$acc/Inbox/new/" "$HOME/.local/share/mail/$acc/inbox/new/" -type f -newer "$muttconfig/.mailsynclastrun" 2> /dev/null) + new=$(find "$HOME/.local/share/mail/$acc/INBOX/new/" "$HOME/.local/share/mail/$acc/Inbox/new/" "$HOME/.local/share/mail/$acc/inbox/new/" -type f -newer "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" 2> /dev/null) newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l) if [ "$newcount" -gt "0" ]; then notify "$acc" "$newcount" & @@ -93,4 +88,4 @@ wait notmuch new 2>/dev/null #Create a touch file that indicates the time of the last run of mailsync -touch "$muttconfig/.mailsynclastrun" +touch "${XDG_CONFIG_HOME:-$HOME/.config}/mutt/.mailsynclastrun" |