浏览代码

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

Fixes #5453.
Sascha Bratton 5 年之前
父节点
当前提交
728c8e7174
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      plugins/nvm/nvm.plugin.zsh

+ 5 - 2
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