From d13d6b199a615851c53777095305f3fe7fdf5369 Mon Sep 17 00:00:00 2001
From: Scott Bronson <brons_git@rinspin.com>
Date: Sun, 13 Feb 2011 21:06:13 -0800
Subject: [PATCH] use a subshell instead of setting the START var

also don't try to install npm if node installation fails.
---
 nvm.sh | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/nvm.sh b/nvm.sh
index 99eb87a..c2a1726 100644
--- a/nvm.sh
+++ b/nvm.sh
@@ -36,21 +36,25 @@ nvm()
         nvm help
         return;
       fi
-      START=`pwd`
-      mkdir -p "$NVM_DIR/src" && \
-      cd "$NVM_DIR/src" && \
-      wget "http://nodejs.org/dist/node-$2.tar.gz" -N && \
-      tar -xzf "node-$2.tar.gz" && \
-      cd "node-$2" && \
-      ./configure --prefix="$NVM_DIR/$2" && \
-      make && \
-      make install && \
-      nvm use $2
-      if ! which npm ; then
-        echo "Installing npm..."
-        curl http://npmjs.org/install.sh | sh
+      if (
+        mkdir -p "$NVM_DIR/src" &&
+        cd "$NVM_DIR/src" && \
+        wget "http://nodejs.org/dist/node-$2.tar.gz" -N && \
+        tar -xzf "node-$2.tar.gz" && \
+        cd "node-$2" && \
+        ./configure --prefix="$NVM_DIR/$2" && \
+        make && \
+        make install
+        )
+      then
+        nvm use $2
+        if ! which npm ; then
+          echo "Installing npm..."
+          curl http://npmjs.org/install.sh | sh
+        fi
+      else
+        echo "nvm: install $2 failed!"
       fi
-      cd $START
     ;;
     "deactivate" )
       if [[ $PATH == *$NVM_DIR/*/bin* ]]; then