summaryrefslogtreecommitdiffstats
path: root/bashrc
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 /bashrc
parent074a6d5dacb42c080be91f87880fbd7f8d988f63 (diff)
downloadconf-209dfc46e2b549a44fac5646026674a6f6d2663e.tar.gz
conf-209dfc46e2b549a44fac5646026674a6f6d2663e.zip
support multiple installation locations of diff-highlight
Diffstat (limited to 'bashrc')
-rw-r--r--bashrc4
1 files changed, 3 insertions, 1 deletions
diff --git a/bashrc b/bashrc
index d33a297..a6fc121 100644
--- a/bashrc
+++ b/bashrc
@@ -5,7 +5,9 @@ type rbenv > /dev/null 2>&1 && eval "$(rbenv init -)"
test -d $HOME/.cargo/bin && export PATH="$HOME/.cargo/bin:$PATH"
# }}}
# environment {{{
-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
# }}}
# Test for an interactive shell. {{{