summaryrefslogtreecommitdiff
path: root/plugins/nvm/nvm.plugin.zsh
diff options
context:
space:
mode:
authorSascha Bratton <sascha@brattonbratton.com>2019-04-08 11:58:27 -0400
committerMarc Cornellà <marc.cornella@live.com>2019-04-08 17:58:27 +0200
commit728c8e717435b31cb7db90168e1e7bd27b95e3f5 (patch)
tree38f1d9ec3e36beb0fafa18095ccc4a5623600dc3 /plugins/nvm/nvm.plugin.zsh
parent9981479900e3d3ff86bff0b3313c8e45891e880c (diff)
downloadzsh-728c8e717435b31cb7db90168e1e7bd27b95e3f5.tar.gz
zsh-728c8e717435b31cb7db90168e1e7bd27b95e3f5.tar.bz2
zsh-728c8e717435b31cb7db90168e1e7bd27b95e3f5.zip
nvm: load nvm script only if command doesn't already exist (#5454)
Fixes #5453.
Diffstat (limited to 'plugins/nvm/nvm.plugin.zsh')
-rw-r--r--plugins/nvm/nvm.plugin.zsh7
1 files changed, 5 insertions, 2 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 9dde3a266..4bab8e9d7 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -1,5 +1,8 @@
# Set NVM_DIR if it isn't already defined
[[ -z "$NVM_DIR" ]] && export NVM_DIR="$HOME/.nvm"
-# Load nvm if it exists
-[[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+# Try to load nvm only if command not already available
+if ! type "nvm" &> /dev/null; then
+ # Load nvm if it exists
+ [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
+fi