summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--plugins/nvm/nvm.plugin.zsh11
1 files changed, 9 insertions, 2 deletions
diff --git a/plugins/nvm/nvm.plugin.zsh b/plugins/nvm/nvm.plugin.zsh
index 21fb3112b..640f1d45c 100644
--- a/plugins/nvm/nvm.plugin.zsh
+++ b/plugins/nvm/nvm.plugin.zsh
@@ -12,15 +12,22 @@ which nvm &> /dev/null && return
if [[ -f "$NVM_DIR/nvm.sh" ]]; then
# Load nvm if it exists in $NVM_DIR
- source "$NVM_DIR/nvm.sh"
+ source "$NVM_DIR/nvm.sh" --no-use
else
# Otherwise try to load nvm installed via Homebrew
# 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"
+ [[ -f "$NVM_HOMEBREW/nvm.sh" ]] && source "$NVM_HOMEBREW/nvm.sh" --no-use
fi
+# Call nvm when first using node, npm or yarn
+function node npm yarn {
+ unfunction node npm yarn
+ nvm use default
+ command "$0" "$@"
+}
+
# Load nvm bash completion
for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
if [[ -f "$nvm_completion" ]]; then