8163f65084b86d5e63c1867d076ecdc8faca2f33

Author
Marc Cornellà <marc.cornella@live.com>
Committer
Marc Cornellà <marc.cornella@live.com>
Date

Message

nvm: exit the plugin if the nvm loading script wasn't found

Diff

 1diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
 2index 164be5907f9813d34b51edfed324375a231e8048..b2355b7eff79af188e98e1cb14092a64ff740615 100644
 3--- a/plugins/nvm/nvm.plugin.zsh
 4+++ b/plugins/nvm/nvm.plugin.zsh
 5@@ -18,7 +18,12 @@ else
 6   # User can set this if they have an unusual Homebrew setup
 7   NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}"
 8   # Load nvm from Homebrew location if it exists
 9-  [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
10+  if [[ -f "$NVM_HOMEBREW/nvm.sh" ]]; then
11+    source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"}
12+  else
13+    # Exit the plugin if we couldn't find nvm
14+    return
15+  fi
16 fi
17 
18 # Call nvm when first using node, npm or yarn
19@@ -42,4 +47,4 @@ for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_complet
20   fi
21 done
22 
23-unset NVM_HOMEBREW nvm_completion
24+unset NVM_HOMEBREW NVM_LAZY nvm_completion