mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-11 08:20:09 +00:00
Merge pull request #1174 from insside/rbenv-homebrew-fix
rbenv plugin now uses 'brew --prefix rbenv' command to find rbenv folder
This commit is contained in:
commit
3ac3141cd6
1 changed files with 14 additions and 1 deletions
|
@ -1,5 +1,18 @@
|
||||||
|
_homebrew-installed() {
|
||||||
|
type brew &> /dev/null
|
||||||
|
}
|
||||||
|
|
||||||
|
_rbenv-from-homebrew-installed() {
|
||||||
|
brew --prefix rbenv &> /dev/null
|
||||||
|
}
|
||||||
|
|
||||||
FOUND_RBENV=0
|
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
|
if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
|
||||||
FOUND_RBENV=1
|
FOUND_RBENV=1
|
||||||
export RBENV_ROOT=$rbenvdir
|
export RBENV_ROOT=$rbenvdir
|
||||||
|
|
Loading…
Reference in a new issue