Skip to content

Commit

Permalink
Merge pull request ohmyzsh#1174 from insside/rbenv-homebrew-fix
Browse files Browse the repository at this point in the history
rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder
  • Loading branch information
robbyrussell committed Jun 22, 2012
2 parents 493238e + 5931f64 commit 3ac3141
Showing 1 changed file with 14 additions and 1 deletion.
15 changes: 14 additions & 1 deletion 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
Expand Down

0 comments on commit 3ac3141

Please sign in to comment.