From 0b4c1e14cf8f00232591a11473c56677a462d550 Mon Sep 17 00:00:00 2001
From: Jordan Harband <ljharb@gmail.com>
Date: Sun, 1 Feb 2015 13:02:46 -0800
Subject: [PATCH] Ensure that `nvm run 0.12 --version` errors out sensibly when
 0.12 isn't installed.

---
 nvm.sh                                               | 12 ++++++++----
 ...uld error out sensibly when 0.x is not installed" |  9 +++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100755 "test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed"

diff --git a/nvm.sh b/nvm.sh
index 497ad2b..a0bfa8d 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -1271,7 +1271,7 @@ nvm() {
       provided_version=$1
       if [ -n "$provided_version" ]; then
         VERSION="$(nvm_version "$provided_version")"
-        if [ "_$VERSION" = "_N/A" ]; then
+        if [ "_$VERSION" = "_N/A" ] && ! nvm_is_valid_version "$provided_version"; then
           provided_version=''
           if [ $has_checked_nvmrc -ne 1 ]; then
             nvm_rc_version && has_checked_nvmrc=1
@@ -1290,16 +1290,20 @@ nvm() {
       local ARGS
       ARGS="$@"
       local OUTPUT
+      local EXIT_CODE
 
-      if [ "$NVM_IOJS" = true ]; then
+      if [ "_$VERSION" = "_N/A" ]; then
+        echo "$(nvm_ensure_version_prefix "$provided_version") is not installed yet" >&2
+        EXIT_CODE=1
+      elif [ "$NVM_IOJS" = true ]; then
         echo "Running io.js $(nvm_strip_iojs_prefix "$VERSION")"
         OUTPUT="$(nvm use "$VERSION" >/dev/null && iojs "$ARGS")"
+        EXIT_CODE="$?"
       else
         echo "Running node $VERSION"
         OUTPUT="$(nvm use "$VERSION" >/dev/null && node "$ARGS")"
+        EXIT_CODE="$?"
       fi
-      local EXIT_CODE
-      EXIT_CODE="$?"
       if [ -n "$OUTPUT" ]; then
         echo "$OUTPUT"
       fi
diff --git "a/test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed" "b/test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed"
new file mode 100755
index 0000000..744ac81
--- /dev/null
+++ "b/test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed"	
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "$(nvm run 0.2 --version 2>&1)" = "v0.2 is not installed yet" ] || die "\`nvm run\` with an uninstalled node version failed to error out correctly"
+[ "$(nvm run iojs-0.2 --version 2>&1)" = "iojs-v0.2 is not installed yet" ] || die "\`nvm run\` with an uninstalled iojs version failed to error out correctly"