Performance enhancement

If nvm has already set up env, don't `nvm use` when running `nvm_auto`.
Incidentally, failing tests from 0798f74 are now gone, too.
This commit is contained in:
Xandor Schiefer 2016-11-15 18:43:02 +02:00
parent 4b5df30460
commit 06e5336b56

14
nvm.sh
View File

@ -3238,15 +3238,13 @@ nvm_auto() {
nvm install >/dev/null nvm install >/dev/null
fi fi
elif [ "_$NVM_MODE" = '_use' ]; then elif [ "_$NVM_MODE" = '_use' ]; then
if [ "_$NVM_CURRENT" != '_system' ]; then if [ "_$NVM_CURRENT" = '_system' ]; then
VERSION="$NVM_CURRENT"
else
VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)" VERSION="$(nvm_resolve_local_alias default 2>/dev/null || nvm_echo)"
fi if [ -n "$VERSION" ]; then
if [ -n "$VERSION" ]; then nvm use --silent "$VERSION" >/dev/null
nvm use --silent "$VERSION" >/dev/null elif nvm_rc_version >/dev/null 2>&1; then
elif nvm_rc_version >/dev/null 2>&1; then nvm use --silent >/dev/null
nvm use --silent >/dev/null fi
fi fi
elif [ "_$NVM_MODE" != '_none' ]; then elif [ "_$NVM_MODE" != '_none' ]; then
nvm_err 'Invalid auto mode supplied.' nvm_err 'Invalid auto mode supplied.'