summaryrefslogtreecommitdiffstats
path: root/zshrc
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2018-10-29 21:35:01 -0400
committerJesse Luehrs <doy@tozt.net>2018-10-29 21:35:01 -0400
commit209dfc46e2b549a44fac5646026674a6f6d2663e (patch)
tree36c168ee3d376583301d4015ae300e4ba523c6db /zshrc
parent074a6d5dacb42c080be91f87880fbd7f8d988f63 (diff)
downloadconf-209dfc46e2b549a44fac5646026674a6f6d2663e.tar.gz
conf-209dfc46e2b549a44fac5646026674a6f6d2663e.zip
support multiple installation locations of diff-highlight
Diffstat (limited to 'zshrc')
-rw-r--r--zshrc4
1 files changed, 3 insertions, 1 deletions
diff --git a/zshrc b/zshrc
index 8d22c1c..e2e8fb1 100644
--- a/zshrc
+++ b/zshrc
@@ -7,7 +7,9 @@ test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH"
# environment {{{
# not using .zshenv, because it runs before /etc/profile, and /etc/profile
# tends to hard-set $PATH and such
-export PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:/usr/lib/ccache/bin:/usr/share/git/diff-highlight:$PATH"
+[ -d /usr/share/git/diff-highlight ] && export PATH="/usr/share/git/diff-highlight:${PATH}"
+[ -d /usr/local/share/git-core/contrib/diff-highlight ] && export PATH="/usr/local/share/git-core/contrib/diff-highlight:${PATH}"
+export PATH="${HOME}/.bin/local:${HOME}/.bin/$(hostname):${HOME}/.bin:/usr/lib/ccache/bin:$PATH"
[ -f "$HOME/.sh/env" ] && source $HOME/.sh/env
# }}}
# Change the window title of X terminals {{{