genebean/dots
1
0
Fork 0
mirror of https://github.com/genebean/dots.git synced 2026-03-27 09:27:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix git difftool's ability to use Araxis Merge

Browse source 
Araxis's compare utility was being masked by the one in /usr/local/bin by way of ImageMagick.
This commit is contained in:
Gene Liverman 2019-05-03 23:22:37 -04:00
parent aa545c7957
commit 42deb5e184
No known key found for this signature in database
GPG key ID: 66D794FE7043CBCA
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
link/nix/zshrc
View file

@ -118,7 +118,12 @@ export PATH=$PATH:~/.nexustools
if [[ `uname` == 'Darwin' ]]; then
export PATH=$PATH:/usr/local/sbin
export PATH=$PATH:/Applications/Araxis\ Merge.app/Contents/Utilities
# Araxis needs to come first so that its tools don't get stomped
# by ones Homebrew installs to /usr/local/bin. In particular, compare
# from ImageMagick breaks using git difftool.
export PATH=/Applications/Araxis\ Merge.app/Contents/Utilities:$PATH
eval '/usr/libexec/path_helper -s' > /dev/null
# optional additions from homebrew