From 209dfc46e2b549a44fac5646026674a6f6d2663e Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Mon, 29 Oct 2018 21:35:01 -0400 Subject: support multiple installation locations of diff-highlight --- zshrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'zshrc') 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 {{{ -- cgit v1.2.3-54-g00ecf