mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-12 21:39:48 +01:00
Merge pull request #2166 from cap10morgan/no-clobber-rbenv-root
rbenv plugin: don't clobber existing RBENV_ROOT & follow Homebrew's default behavior
This commit is contained in:
commit
92a54ebc7e
1 changed files with 7 additions and 1 deletions
|
@ -10,12 +10,18 @@ FOUND_RBENV=0
|
|||
rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv")
|
||||
if _homebrew-installed && _rbenv-from-homebrew-installed ; then
|
||||
rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}")
|
||||
if [[ $RBENV_ROOT = '' ]]; then
|
||||
RBENV_ROOT="$HOME/.rbenv"
|
||||
fi
|
||||
fi
|
||||
|
||||
for rbenvdir in "${rbenvdirs[@]}" ; do
|
||||
if [ -d $rbenvdir/bin -a $FOUND_RBENV -eq 0 ] ; then
|
||||
FOUND_RBENV=1
|
||||
export RBENV_ROOT=$rbenvdir
|
||||
if [[ $RBENV_ROOT = '' ]]; then
|
||||
RBENV_ROOT=$rbenvdir
|
||||
fi
|
||||
export RBENV_ROOT
|
||||
export PATH=${rbenvdir}/bin:$PATH
|
||||
eval "$(rbenv init --no-rehash - zsh)"
|
||||
|
||||
|
|
Loading…
Reference in a new issue