Commit 8741664e authored by Marc Cornellà's avatar Marc Cornellà

fix(nvm): don't try to load nvm via `brew` if not found (#10878)

Fixes #10878
parent a879ff15
...@@ -8,12 +8,13 @@ if [[ -z "$NVM_DIR" ]]; then ...@@ -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 ...@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment