diff options
| author | Marc Cornellà <marc.cornella@live.com> | 2020-10-09 16:40:13 +0200 |
|---|---|---|
| committer | Marc Cornellà <marc.cornella@live.com> | 2020-10-09 17:21:03 +0200 |
| commit | 8163f65084b86d5e63c1867d076ecdc8faca2f33 (patch) | |
| tree | c9aa4f402e93cd016325493f9378bd232ee6a789 /plugins/nvm | |
| parent | a33c0cdb46badcc1df9a37da015a82f7f7b0a7e5 (diff) | |
| download | zsh-8163f65084b86d5e63c1867d076ecdc8faca2f33.tar.gz zsh-8163f65084b86d5e63c1867d076ecdc8faca2f33.tar.bz2 zsh-8163f65084b86d5e63c1867d076ecdc8faca2f33.zip | |
nvm: exit the plugin if the nvm loading script wasn't found
Diffstat (limited to 'plugins/nvm')
| -rw-r--r-- | plugins/nvm/nvm.plugin.zsh | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh index 164be5907..b2355b7ef 100644 --- a/plugins/nvm/nvm.plugin.zsh +++ b/plugins/nvm/nvm.plugin.zsh @@ -18,7 +18,12 @@ else # User can set this if they have an unusual Homebrew setup NVM_HOMEBREW="${NVM_HOMEBREW:-/usr/local/opt/nvm}" # Load nvm from Homebrew location if it exists - [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" ${NVM_LAZY+"--no-use"} + 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 fi # Call nvm when first using node, npm or yarn @@ -42,4 +47,4 @@ for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_complet fi done -unset NVM_HOMEBREW nvm_completion +unset NVM_HOMEBREW NVM_LAZY nvm_completion |