From 42deb5e18442f5cb07c1a942448306bc97d94eb0 Mon Sep 17 00:00:00 2001 From: Gene Liverman Date: Fri, 3 May 2019 23:22:37 -0400 Subject: [PATCH] Fix git difftool's ability to use Araxis Merge Araxis's compare utility was being masked by the one in /usr/local/bin by way of ImageMagick. --- link/nix/zshrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/link/nix/zshrc b/link/nix/zshrc index d83d084..a07bc57 100644 --- a/link/nix/zshrc +++ b/link/nix/zshrc @@ -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