Don't reset to default nvm version on cd if it was set manually

This commit is contained in:
Luke Childs 2017-01-03 21:23:11 +07:00
parent 8bdba4fa1e
commit d03b986535

View File

@ -57,6 +57,10 @@ _zsh_nvm_load() {
'revert') 'revert')
_zsh_nvm_revert _zsh_nvm_revert
;; ;;
'use')
_zsh_nvm_nvm "$@"
export NVM_AUTO_USE_ACTIVE=false
;;
*) *)
_zsh_nvm_nvm "$@" _zsh_nvm_nvm "$@"
;; ;;
@ -159,8 +163,9 @@ _zsh_nvm_auto_use() {
if [ "$nvmrc_node_version" != "N/A" ] && [ "$nvmrc_node_version" != "$node_version" ]; then if [ "$nvmrc_node_version" != "N/A" ] && [ "$nvmrc_node_version" != "$node_version" ]; then
nvm use nvm use
export NVM_AUTO_USE_ACTIVE=true
fi 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" echo "Reverting to nvm default version"
nvm use default nvm use default
fi fi