Enhance handling of the Homebrew environment

- Call "brew shellenv" to set all relevant environment variables,
- and use "$HOMEBREW_PREFIX" when looking for installed files.

diff --git a/plugins/autojump/autojump.zshrc b/plugins/autojump/autojump.zshrc
index f252aabcbd5b9b048cab733c7dc32748fd7d27e0..f5c9e0acba07ee7713e51d50bc5e3002ef05dc8a 100644 (file)
--- a/plugins/autojump/autojump.zshrc
+++ b/plugins/autojump/autojump.zshrc
@@ -2,6 +2,7 @@
 # autojump.zshrc: Initialize "autojump"
 
 for script (
+       "$HOMEBREW_PREFIX/etc/profile.d/autojump.sh"
        "/usr/local/etc/profile.d/autojump.sh"
        "/usr/share/autojump/autojump.zsh"
 ); do

diff --git a/plugins/fzf/fzf.zshrc b/plugins/fzf/fzf.zshrc
index 85bcc37229f5cba9e75fd45b5323e11518d0352c..95c6ff8d0a3141877b9b93a5d549c150a88c1635 100644 (file)
--- a/plugins/fzf/fzf.zshrc
+++ b/plugins/fzf/fzf.zshrc
@@ -25,6 +25,7 @@ fi
 
 # Search for and read in FZF ZSH integration files
 for dir (
+       "$HOMEBREW_PREFIX"/opt/fzf/shell
        /usr/local/lib/fzf/shell
        /usr/local/opt/fzf/shell
        /usr/local/share/examples/fzf/shell

diff --git a/plugins/homebrew/homebrew.zprofile b/plugins/homebrew/homebrew.zprofile
index 5885efdb57b3720f80f9e10c7a502db94924e984..ccab0b73bb95f9bbaf41dc25aaf29f03b5c0a104 100644 (file)
--- a/plugins/homebrew/homebrew.zprofile
+++ b/plugins/homebrew/homebrew.zprofile
@@ -4,7 +4,9 @@
 # Make sure that "brew(1)" is installed
 (( $+commands[brew] )) || return 1
 
-[[ -d "/usr/local/share/zsh-completions" ]] \
-       && axzsh_fpath+=(/usr/local/share/zsh-completions)
+eval "$(brew shellenv)"
+
+[[ -d "$HOMEBREW_PREIX/share/zsh-completions" ]] \
+       && axzsh_fpath+=("$HOMEBREW_PREFIX/share/zsh-completions")
 
 return 0