diff options
| author | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
|---|---|---|
| committer | Andrew Janke <andrew@apjanke.net> | 2015-09-28 08:52:03 -0400 |
| commit | e4fdb083655fc582ebcecb07cd1bd1130077f0e4 (patch) | |
| tree | fee07d9adfee79d1c88206ead154a23520ac51cb /plugins/rbenv/rbenv.plugin.zsh | |
| parent | 5c8b0cc0c1782b34790548498018fb9e0300992b (diff) | |
| parent | b05ef1034fffd7b0c29f1558a8a357ccce7ae74b (diff) | |
| download | zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.gz zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.tar.bz2 zsh-e4fdb083655fc582ebcecb07cd1bd1130077f0e4.zip | |
Merge branch 'master' into copyfile-portability
Diffstat (limited to 'plugins/rbenv/rbenv.plugin.zsh')
| -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 |