mirror of
https://github.com/ohmyzsh/ohmyzsh.git
synced 2024-11-25 15:20:08 +00:00
fix(nvm): don't try to load nvm via brew
if not found (#10878)
Fixes #10878
This commit is contained in:
parent
a879ff1515
commit
8741664e55
1 changed files with 5 additions and 3 deletions
|
@ -8,12 +8,13 @@ if [[ -z "$NVM_DIR" ]]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Don't try to load nvm if command already available
|
# Don't try to load nvm if command already available
|
||||||
which nvm &> /dev/null && return
|
# Note: nvm is a function so we need to use `which`
|
||||||
|
! which nvm &>/dev/null || return
|
||||||
|
|
||||||
if [[ -f "$NVM_DIR/nvm.sh" ]]; then
|
if [[ -f "$NVM_DIR/nvm.sh" ]]; then
|
||||||
# Load nvm if it exists in $NVM_DIR
|
# Load nvm if it exists in $NVM_DIR
|
||||||
source "$NVM_DIR/nvm.sh" ${NVM_LAZY+"--no-use"}
|
source "$NVM_DIR/nvm.sh" ${NVM_LAZY+"--no-use"}
|
||||||
else
|
elif (( $+commands[brew] )); then
|
||||||
# Otherwise try to load nvm installed via Homebrew
|
# Otherwise try to load nvm installed via Homebrew
|
||||||
# User can set this if they have an unusual Homebrew setup
|
# User can set this if they have an unusual Homebrew setup
|
||||||
NVM_HOMEBREW="${NVM_HOMEBREW:-${HOMEBREW_PREFIX:-$(brew --prefix)}/opt/nvm}"
|
NVM_HOMEBREW="${NVM_HOMEBREW:-${HOMEBREW_PREFIX:-$(brew --prefix)}/opt/nvm}"
|
||||||
|
@ -21,9 +22,10 @@ else
|
||||||
if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then
|
if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then
|
||||||
source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
|
source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
|
||||||
else
|
else
|
||||||
# Exit the plugin if we couldn't find nvm
|
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Call nvm when first using node, npm or yarn
|
# Call nvm when first using node, npm or yarn
|
||||||
|
|
Loading…
Reference in a new issue