mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2026-05-01 04:30:37 +02:00
[chruby] avoid calling brew --prefix 3 times
once is enough, improves performance significantly scope variable to local via anonymous function
This commit is contained in:
parent
53526db979
commit
927d5ecec6
1 changed files with 16 additions and 16 deletions
|
|
@ -20,10 +20,6 @@ _homebrew-installed() {
|
||||||
whence brew &> /dev/null
|
whence brew &> /dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
_chruby-from-homebrew-installed() {
|
|
||||||
[ -r $(brew --prefix chruby) ] &> /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
_ruby-build_installed() {
|
_ruby-build_installed() {
|
||||||
whence ruby-build &> /dev/null
|
whence ruby-build &> /dev/null
|
||||||
}
|
}
|
||||||
|
|
@ -63,18 +59,22 @@ _chruby_dirs() {
|
||||||
done
|
done
|
||||||
}
|
}
|
||||||
|
|
||||||
if _homebrew-installed && _chruby-from-homebrew-installed ; then
|
function () {
|
||||||
source $(brew --prefix chruby)/share/chruby/chruby.sh
|
local _chruby_homebrew_prefix=$(brew --prefix chruby) &> /dev/null
|
||||||
source $(brew --prefix chruby)/share/chruby/auto.sh
|
|
||||||
_chruby_dirs
|
if _homebrew-installed && [ -r ${_chruby_homebrew_prefix} ] ; then
|
||||||
elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
|
source ${_chruby_homebrew_prefix}/share/chruby/chruby.sh
|
||||||
source /usr/local/share/chruby/chruby.sh
|
source ${_chruby_homebrew_prefix}/share/chruby/auto.sh
|
||||||
source /usr/local/share/chruby/auto.sh
|
_chruby_dirs
|
||||||
_chruby_dirs
|
elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
|
||||||
else
|
source /usr/local/share/chruby/chruby.sh
|
||||||
_source_from_omz_settings
|
source /usr/local/share/chruby/auto.sh
|
||||||
_chruby_dirs
|
_chruby_dirs
|
||||||
fi
|
else
|
||||||
|
_source_from_omz_settings
|
||||||
|
_chruby_dirs
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
function ensure_chruby() {
|
function ensure_chruby() {
|
||||||
$(whence chruby)
|
$(whence chruby)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue