浏览代码

Merge pull request #4248 from gabetax/rbenv_plugin_load_performance

reduce rbenv plugin load time by 150ms by removing additional brew call
Robby Russell 9 年之前
父节点
当前提交
2f6d85d64e
共有 1 个文件被更改,包括 3 次插入6 次删除
  1. 3 6
      plugins/rbenv/rbenv.plugin.zsh

+ 3 - 6
plugins/rbenv/rbenv.plugin.zsh

@@ -2,14 +2,11 @@ _homebrew-installed() {
   type brew &> /dev/null
   type brew &> /dev/null
 }
 }
 
 
-_rbenv-from-homebrew-installed() {
-  brew --prefix rbenv &> /dev/null
-}
-
 FOUND_RBENV=0
 FOUND_RBENV=0
 rbenvdirs=("$HOME/.rbenv" "/usr/local/rbenv" "/opt/rbenv" "/usr/local/opt/rbenv")
 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
 fi
 
 
 for rbenvdir in "${rbenvdirs[@]}" ; do
 for rbenvdir in "${rbenvdirs[@]}" ; do