From 937c29c95ace2489c0b99bc98b4de27cf0ec9078 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Thu, 8 Oct 2015 16:46:16 -0700
Subject: [PATCH] nvm run: use common code path for "ensure version installed"

Better than cb033adc6f8fa0987ab4268b6298b7161c972c52
---
 nvm.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/nvm.sh b/nvm.sh
index b59922b..6bb4ecc 100755
--- a/nvm.sh
+++ b/nvm.sh
@@ -1876,16 +1876,6 @@ nvm() {
         fi
       fi
 
-      if [ -n "$NVM_RC_VERSION" ]; then
-        nvm_ensure_version_installed "$NVM_RC_VERSION"
-      else
-        nvm_ensure_version_installed "$provided_version"
-      fi
-      EXIT_CODE=$?
-      if [ "$EXIT_CODE" != "0" ]; then
-        return $EXIT_CODE
-      fi
-
       local NVM_IOJS
       if nvm_is_iojs_version "$VERSION"; then
         NVM_IOJS=true
@@ -1902,7 +1892,10 @@ nvm() {
         ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | command grep shwordsplit > /dev/null ; echo $?)
         setopt shwordsplit
       fi
-      if [ -z "$ARGS" ]; then
+      if [ "_$VERSION" = "_N/A" ]; then
+        nvm_ensure_version_installed "$provided_version"
+        EXIT_CODE=$?
+      elif [ -z "$ARGS" ]; then
         if [ "$NVM_IOJS" = true ]; then
           nvm exec "$VERSION" iojs
         else