From d03b986535b933bb113025d9f107ec2e95d08d26 Mon Sep 17 00:00:00 2001 From: Luke Childs Date: Tue, 3 Jan 2017 21:23:11 +0700 Subject: [PATCH] Don't reset to default nvm version on cd if it was set manually --- zsh-nvm.plugin.zsh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/zsh-nvm.plugin.zsh b/zsh-nvm.plugin.zsh index 4997b5c..6335442 100644 --- a/zsh-nvm.plugin.zsh +++ b/zsh-nvm.plugin.zsh @@ -57,6 +57,10 @@ _zsh_nvm_load() { 'revert') _zsh_nvm_revert ;; + 'use') + _zsh_nvm_nvm "$@" + export NVM_AUTO_USE_ACTIVE=false + ;; *) _zsh_nvm_nvm "$@" ;; @@ -159,8 +163,9 @@ _zsh_nvm_auto_use() { if [ "$nvmrc_node_version" != "N/A" ] && [ "$nvmrc_node_version" != "$node_version" ]; then nvm use + export NVM_AUTO_USE_ACTIVE=true fi - elif [ "$node_version" != "$(nvm version default)" ]; then + elif [ "$node_version" != "$(nvm version default)" ] && [ "$NVM_AUTO_USE_ACTIVE" = true ]; then echo "Reverting to nvm default version" nvm use default fi