`728c8e717435b31cb7db90168e1e7bd27b95e3f5`

Author: Sascha Bratton <sascha@brattonbratton.com>
Committer: Marc Cornellà <marc.cornella@live.com>
Date: 2019-04-08 15:58 UTC

Message

nvm: load nvm script only if command doesn't already exist (#5454)

Fixes #5453.

Diff

 1diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
 2index 9dde3a266ae18237c8cbabe3e7af862c6450f6af..4bab8e9d701f91bf6998148327e1fcf40b521eda 100644
 3--- a/plugins/nvm/nvm.plugin.zsh
 4+++ b/plugins/nvm/nvm.plugin.zsh
 5@@ -1,5 +1,8 @@
 6 # Set NVM_DIR if it isn't already defined
 7 [[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
 8 
 9-# Load nvm if it exists
10-[[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
11+# Try to load nvm only if command not already available
12+if ! type "nvm" &> /dev/null; then
13+    # Load nvm if it exists
14+    [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
15+fi