Cornelicorn/oh-my-zsh
1
0
Fork 0
mirror of https://github.com/robbyrussell/oh-my-zsh.git synced 2025-12-06 07:20:40 +01:00
Code Issues Releases Wiki Activity

fix(chruby): avoid adding PATH entries twice (#12980)

Browse Source
This commit is contained in:
Dennis Dashkevich
2025-08-26 05:51:00 +03:00
committed by GitHub
parent b95022dde6
commit 266bc17ab3
1 changed files with 13 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/chruby/chruby.plugin.zsh
View File

@@ -15,6 +15,13 @@ _source-from-omz-settings() {
fi fi
} }
_source-from-default-location() {
[[ -r /usr/local/share/chruby/chruby.sh ]] || return 1
source /usr/local/share/chruby/chruby.sh
source /usr/local/share/chruby/auto.sh
}
_source-from-homebrew() { _source-from-homebrew() {
(( $+commands[brew] )) || return 1 (( $+commands[brew] )) || return 1
@@ -36,27 +43,14 @@ _source-from-homebrew() {
source $_brew_prefix/share/chruby/auto.sh source $_brew_prefix/share/chruby/auto.sh
} }
_load-chruby-dirs() {
local dir
for dir in "$HOME/.rubies" "$PREFIX/opt/rubies"; do
if [[ -d "$dir" ]]; then
RUBIES+=("$dir")
fi
done
}
# Load chruby # Load chruby
if _source-from-omz-settings; then _source-from-omz-settings || \
_load-chruby-dirs _source-from-default-location || \
elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then _source-from-homebrew
source /usr/local/share/chruby/chruby.sh
source /usr/local/share/chruby/auto.sh
_load-chruby-dirs
elif _source-from-homebrew; then
_load-chruby-dirs
fi
unfunction _source-from-homebrew _source-from-omz-settings _load-chruby-dirs unfunction _source-from-homebrew \
_source-from-default-location \
_source-from-omz-settings
## chruby utility functions and aliases ## chruby utility functions and aliases