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

Fixes #5453.

nvm: load nvm script only if command doesn't already exist (#5454)
Fixes #5453.
728c8e71 · Sascha Bratton · Marc Cornellà · 99814799 · 728c8e71
Commit 728c8e71 authored Apr 08, 2019 by Sascha Bratton Committed by Marc Cornellà Apr 08, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

nvm.plugin.zsh plugins/nvm/nvm.plugin.zsh +5 -2

No files found.
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
 # 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