diff options
| author | Robby Russell <robby@planetargon.com> | 2012-06-22 06:39:28 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2012-06-22 06:39:28 -0700 |
| commit | 3ac3141cd610de995b2435011ac895ad15b89e2e (patch) | |
| tree | 45e88e3a8cbfd3acfc46976a8fa1588c87e74855 /plugins/rbenv | |
| parent | 493238e29bcf112a5c891f438f44af8312e546c6 (diff) | |
| parent | 5931f64308cbf4b0a8ef740a6b4eda5834479bd7 (diff) | |
| download | zsh-3ac3141cd610de995b2435011ac895ad15b89e2e.tar.gz zsh-3ac3141cd610de995b2435011ac895ad15b89e2e.tar.bz2 zsh-3ac3141cd610de995b2435011ac895ad15b89e2e.zip | |
Merge pull request #1174 from insside/rbenv-homebrew-fix
rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder
Diffstat (limited to 'plugins/rbenv')
| -rw-r--r-- | plugins/rbenv/rbenv.plugin.zsh | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh index ae37404cd..a62dd5602 100644 --- a/plugins/rbenv/rbenv.plugin.zsh +++ b/plugins/rbenv/rbenv.plugin.zsh @@ -1,5 +1,18 @@ +_homebrew-installed() { + type brew &> /dev/null +} + +_rbenv-from-homebrew-installed() { + brew --prefix rbenv &> /dev/null +} + FOUND_RBENV=0 -for rbenvdir in "$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" ; do +rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv") +if _homebrew-installed && _rbenv-from-homebrew-installed ; then + rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}") +fi + +for rbenvdir in "${rbenvdirs[@]}" ; do if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then FOUND_RBENV=1 export RBENV_ROOT=$rbenvdir |