From 06e5336b56fd1363a643965387bc20c4b6ddba33 Mon Sep 17 00:00:00 2001
From: Xandor Schiefer <me@xandor.co.za>
Date: Tue, 15 Nov 2016 18:43:02 +0200
Subject: [PATCH] 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.
---
 nvm.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

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