diff options
| author | Marc Cornellà <hello@mcornella.com> | 2022-04-24 18:58:36 +0200 |
|---|---|---|
| committer | Marc Cornellà <hello@mcornella.com> | 2022-04-24 18:59:44 +0200 |
| commit | 8741664e5561c244d841be780b171171ae665fda (patch) | |
| tree | b4200180cfb1dd81a243e0fde25c7a71e694b456 /plugins | |
| parent | a879ff1515b6bd80eea695c03e22289bd6743718 (diff) | |
| download | zsh-8741664e5561c244d841be780b171171ae665fda.tar.gz zsh-8741664e5561c244d841be780b171171ae665fda.tar.bz2 zsh-8741664e5561c244d841be780b171171ae665fda.zip | |
fix(nvm): don't try to load nvm via `brew` if not found (#10878)
Fixes #10878
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/nvm/nvm.plugin.zsh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index b8f28c27c..630854a71 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -8,12 +8,13 @@ if [[ -z "$NVM_DIR" ]]; then fi # 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 # Load nvm if it exists in $NVM_DIR source "$NVM_DIR/nvm.sh" ${NVM_LAZY+"--no-use"} -else +elif (( $+commands[brew] )); then # Otherwise try to load nvm installed via Homebrew # User can set this if they have an unusual Homebrew setup NVM_HOMEBREW="${NVM_HOMEBREW:-${HOMEBREW_PREFIX:-$(brew --prefix)}/opt/nvm}" @@ -21,9 +22,10 @@ else if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"} else - # Exit the plugin if we couldn't find nvm return fi +else + return fi # Call nvm when first using node, npm or yarn |