diff options
| author | Tim O'Brien <timo@t413.com> | 2015-09-14 15:39:18 -0700 |
|---|---|---|
| committer | Tim O'Brien <timo@t413.com> | 2015-09-14 15:39:18 -0700 |
| commit | e8639c700ebbf8aa416c0d14c8e3a292f1062dd7 (patch) | |
| tree | 7705714541cc8781a1be7e1d2343d34e5e8aa9b1 /plugins/rbenv | |
| parent | 797e1f9a64c0d2775723bb28c76745b327f86d56 (diff) | |
| parent | 9c08641d7c2aae0c82fa5ad91f94c67b70115ba5 (diff) | |
| download | zsh-e8639c700ebbf8aa416c0d14c8e3a292f1062dd7.tar.gz zsh-e8639c700ebbf8aa416c0d14c8e3a292f1062dd7.tar.bz2 zsh-e8639c700ebbf8aa416c0d14c8e3a292f1062dd7.zip | |
Update to current robbyrussell/oh-my-zsh master
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 |