diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-23 18:53:05 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-23 18:53:05 -0400 |
| commit | 96ff86142e9037e707f9cde8ab69e0425a0559c6 (patch) | |
| tree | 217cb5e2b4a1c55afec79984c3c3c0a9efe2bf69 /plugins/rbenv | |
| parent | 502f08b5e19716d43a7ec8b006178a7b017f68cd (diff) | |
| parent | 76a26a2a59d8c6d0f65a4426cdb93920e255aea7 (diff) | |
| download | zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.gz zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.tar.bz2 zsh-96ff86142e9037e707f9cde8ab69e0425a0559c6.zip | |
Merge branch 'master' into installer-cygwin-support-3
Conflicts:
tools/install.sh
Diffstat (limited to 'plugins/rbenv')
| -rw-r--r-- | plugins/rbenv/rbenv.plugin.zsh | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/plugins/rbenv/rbenv.plugin.zsh b/plugins/rbenv/rbenv.plugin.zsh index 213e1beb0..ef5106f2d 100644 --- a/plugins/rbenv/rbenv.plugin.zsh +++ b/plugins/rbenv/rbenv.plugin.zsh @@ -2,14 +2,11 @@ _homebrew-installed() { type brew &> /dev/null } -_rbenv-from-homebrew-installed() { - brew --prefix rbenv &> /dev/null -} - FOUND_RBENV=0 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv") -if _homebrew-installed && _rbenv-from-homebrew-installed ; then - rbenvdirs=($(brew --prefix rbenv) "${rbenvdirs[@]}") +if _homebrew-installed && rbenv_homebrew_path=$(brew --prefix rbenv 2>/dev/null); then + rbenvdirs=($rbenv_homebrew_path "${rbenvdirs[@]}") + unset rbenv_homebrew_path fi for rbenvdir in "${rbenvdirs[@]}" ; do |