v0.9.0

Fixes #446

.travis.yml

@@ -2,7 +2,13 @@ language: c # defaults to ruby
 install:
   - sudo apt-get install ksh zsh -y
 before_script:
-  - curl -o /tmp/urchin https://raw.github.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin
+  - curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin
 script:
-  - NVM_DIR=$TRAVIS_BUILD_DIR make URCHIN=/tmp/urchin test
-
+  - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL
+env:
+  - SHELL=sh TEST_SUITE=fast
+  - SHELL=dash TEST_SUITE=fast
+  - SHELL=bash TEST_SUITE=fast
+  - SHELL=zsh TEST_SUITE=fast
+  - SHELL=ksh TEST_SUITE=fast
+  - SHELL=sh TEST_SUITE=slow

CONTRIBUTING.md

@@ -5,7 +5,7 @@ We love pull requests, they're our favorite.
 However, before submitting, please review the following:
 
  - Please include tests. Changes with tests will be merged very quickly.
- - Please manually confirm that your changes, and all tests, pass in `bash`, `sh`, and `zsh`. We hope to soon automatically run all these tests, but in the meantime, we have to rely on each contributor doing so.
+ - Please manually confirm that your changes work in `bash`, `sh`/`dash`, `ksh`, and `zsh`. Fast tests do run in these shells, but it's nice to manually verify also.
  - Please maintain consistent whitespace - 2-space indentation, trailing newlines in all files, etc.
  - Any time you make a change to your PR, please rebase freshly on top of master. Nobody likes merge commits.
 

Makefile

@@ -1,15 +1,14 @@
 URCHIN=`which urchin`
 SHELLS=sh bash dash ksh zsh
+TEST_SUITE=fast
 
 .PHONY: $(SHELLS) test
 
-fast: $(SHELLS)
-
 $(SHELLS):
 	@printf '\n\033[0;34m%s\033[0m\n' "Running tests in $@"
-	@$@ $(URCHIN) -f test/fast
+	@$@ $(URCHIN) -f test/$(TEST_SUITE)
 
-test: fast
+test: $(SHELLS)
 	@$(URCHIN) -f test/slow 
 
 default: test

README.markdown

@@ -1,4 +1,4 @@
-# Node Version Manager [![Build Status](https://travis-ci.org/creationix/nvm.svg?branch=master)](https://travis-ci.org/creationix/nvm)
+# Node Version Manager [![Build Status](https://travis-ci.org/creationix/nvm.svg?branch=master)][3]
 
 ## Installation
 
@@ -6,17 +6,17 @@ First you'll need to make sure your system has a c++ compiler.  For OSX, XCode w
 
 ### Install script
 
-To install you could use the [install script](https://github.com/creationix/nvm/blob/v0.5.0/install.sh) using cURL:
+To install you could use the [install script][2] using cURL:
 
-    curl https://raw.github.com/creationix/nvm/v0.5.0/install.sh | sh
+    curl https://raw.githubusercontent.com/creationix/nvm/v0.9.0/install.sh | sh
 
 or Wget:
 
-    wget -qO- https://raw.github.com/creationix/nvm/v0.5.0/install.sh | sh
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.9.0/install.sh | sh
 
 <sub>The script clones the nvm repository to `~/.nvm` and adds the source line to your profile (`~/.bash_profile`, `~/.zshrc` or `~/.profile`).</sub>
 
-You can customize the install source, directory and profile using the `NVM_SOURCE`, `NVM_DIR` and `NVM_PROFILE` variables. Eg: `curl ... | NVM_DIR=/usr/local/nvm sh` for a global install.
+You can customize the install source, directory and profile using the `NVM_SOURCE`, `NVM_DIR` and `PROFILE` variables. Eg: `curl ... | NVM_DIR=/usr/local/nvm sh` for a global install.
 
 <sub>*NB. The installer can use Git, cURL or Wget to download NVM, whatever is available.*</sub>
 
@@ -37,6 +37,9 @@ Often I also put in a line to use a specific version of node.
 
 ## Usage
 
+You can create an `.nvmrc` file containing version number in the project root directory (or any parent directory).
+`nvm use`, `nvm install`, and `nvm run` will all respect an `.nvmrc` file.
+
 To download, compile, and install the latest v0.10.x release of node, do this:
 
     nvm install 0.10
@@ -45,13 +48,9 @@ And then in any new shell just use the installed version:
 
     nvm use 0.10
 
-You can create an `.nvmrc` file containing version number in the project root folder; run the following command to switch versions:
-
-    nvm use
-
 Or you can just run it:
 
-    nvm run 0.10
+    nvm run 0.10 --version
 
 If you want to see what versions are installed:
 
@@ -90,7 +89,7 @@ The above copyright notice and this permission notice shall be included in all c
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 ## Running tests
-Tests are written in [Urchin](https://github.com/scraperwiki/urchin). Install Urchin (and other dependencies) like so:
+Tests are written in [Urchin]. Install Urchin (and other dependencies) like so:
 
     npm install
 
@@ -133,17 +132,17 @@ nvm alias
 	default
 
 	$ nvm alias my_alias [tab][tab]
-	v0.4.11        v0.4.12       v0.6.14
+	v0.6.21        v0.8.26       v0.10.28
 
 nvm use
 
 	$ nvm use [tab][tab]
-	my_alias        default        v0.4.11        v0.4.12       v0.6.14
+	my_alias        default        v0.6.21        v0.8.26       v0.10.28
 
 nvm uninstall
 
 	$ nvm uninstall [tab][tab]
-	my_alias        default        v0.4.11        v0.4.12       v0.6.14
+	my_alias        default        v0.6.21        v0.8.26       v0.10.28
 
 ## Problems
 
@@ -163,3 +162,8 @@ After the v0.8.6 release of node, nvm tries to install from binary packages. But
 
     nvm install -s 0.8.6
 
+[1]: https://github.com/creationix/nvm.git
+[2]: https://github.com/creationix/nvm/blob/v0.9.0/install.sh
+[3]: https://travis-ci.org/creationix/nvm
+[Urchin]: https://github.com/scraperwiki/urchin
+

install.sh

@@ -30,14 +30,14 @@ install_from_git() {
 
   if [ -d "$NVM_DIR/.git" ]; then
     echo "=> nvm is already installed in $NVM_DIR, trying to update"
-    echo -e "\r=> \c"
+    printf "\r=> "
     cd "$NVM_DIR" && git pull 2> /dev/null || {
       echo >&2 "Failed to update nvm, run 'git pull' in $NVM_DIR yourself.."
     }
   else
     # Cloning to $NVM_DIR
     echo "=> Downloading nvm from git to '$NVM_DIR'"
-    echo -e "\r=> \c"
+    printf "\r=> "
     mkdir -p "$NVM_DIR"
     git clone "$NVM_SOURCE" "$NVM_DIR"
   fi
@@ -45,7 +45,7 @@ install_from_git() {
 
 install_as_script() {
   if [ -z "$NVM_SOURCE" ]; then
-    NVM_SOURCE="https://raw.github.com/creationix/nvm/master/nvm.sh"
+    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/master/nvm.sh"
   fi
 
   # Downloading to $NVM_DIR
@@ -101,7 +101,7 @@ if [ -z "$PROFILE" ]; then
   fi
 fi
 
-SOURCE_STR="[ -s \"$NVM_DIR/nvm.sh\" ] && . \"$NVM_DIR/nvm.sh\"  # This loads nvm"
+SOURCE_STR="\nexport NVM_DIR=\"$NVM_DIR\"\n[ -s \"\$NVM_DIR/nvm.sh\" ] && . \"\$NVM_DIR/nvm.sh\"  # This loads nvm"
 
 if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
   if [ -z $PROFILE ]; then
@@ -112,15 +112,13 @@ if [ -z "$PROFILE" ] || [ ! -f "$PROFILE" ] ; then
     echo "=> Create it (touch $PROFILE) and run this script again"
   fi
   echo "   OR"
-  echo "=> Append the following line to the correct file yourself:"
-  echo
-  echo "   $SOURCE_STR"
+  echo "=> Append the following lines to the correct file yourself:"
+  printf "$SOURCE_STR"
   echo
 else
   if ! grep -qc 'nvm.sh' $PROFILE; then
     echo "=> Appending source string to $PROFILE"
-    echo "" >> "$PROFILE"
-    echo $SOURCE_STR >> "$PROFILE"
+    printf "$SOURCE_STR" >> "$PROFILE"
   else
     echo "=> Source string already in $PROFILE"
   fi

nvm-exec

@@ -4,12 +4,11 @@ DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "$DIR/nvm.sh"
 
-if [ ! "$NODE_VERSION" ]; then
-  echo 'NODE_VERSION not set'
-  exit 1
+if [ -n "$NODE_VERSION" ]; then
+  nvm use $NODE_VERSION > /dev/null || (echo "NODE_VERSION not set" >&2 && exit 127)
+else
+  nvm use > /dev/null || (echo "No .nvmrc file found" >&2 && exit 127)
 fi
 
-nvm use $NODE_VERSION
-
 exec $@
 

nvm.sh

@@ -34,17 +34,39 @@ if [ -z "$NVM_NODEJS_ORG_MIRROR" ]; then
   export NVM_NODEJS_ORG_MIRROR="http://nodejs.org/dist"
 fi
 
+# Traverse up in directory tree to find containing folder
+nvm_find_up() {
+  local path
+  path=$PWD
+  while [ "$path" != "" ] && [ ! -f "$path/$1" ]; do
+    path=${path%/*}
+  done
+  echo "$path"
+}
+
+
+nvm_find_nvmrc() {
+  local dir
+  dir="$(nvm_find_up '.nvmrc')"
+  if [ -e "$dir/.nvmrc" ]; then
+    echo "$dir/.nvmrc"
+  fi
+}
+
 # Obtain nvm version from rc file
 nvm_rc_version() {
-  if [ -e .nvmrc ]; then
-    NVM_RC_VERSION=`cat .nvmrc | head -n 1`
-    echo "Found .nvmrc files with version <$NVM_RC_VERSION>"
+  local NVMRC_PATH
+  NVMRC_PATH="$(nvm_find_nvmrc)"
+  if [ -e "$NVMRC_PATH" ]; then
+    NVM_RC_VERSION=`cat "$NVMRC_PATH" | head -n 1`
+    echo "Found '$NVMRC_PATH' with version <$NVM_RC_VERSION>"
   fi
 }
 
 # Expand a version using the version cache
 nvm_version() {
-  local PATTERN=$1
+  local PATTERN
+  PATTERN=$1
   local VERSION
   # The default version is the current one
   if [ -z "$PATTERN" ]; then
@@ -55,18 +77,19 @@ nvm_version() {
   echo "$VERSION"
 
   if [ "$VERSION" = 'N/A' ]; then
-    return
+    return 3
   fi
 }
 
 nvm_remote_version() {
-  local PATTERN=$1
+  local PATTERN
+  PATTERN=$1
   local VERSION
   VERSION=`nvm_ls_remote $PATTERN | tail -n1`
   echo "$VERSION"
 
   if [ "$VERSION" = 'N/A' ]; then
-    return
+    return 3
   fi
 }
 
@@ -78,16 +101,32 @@ nvm_format_version() {
   echo "$1" | sed -e 's/^\([0-9]\)/v\1/g'
 }
 
+nvm_strip_path() {
+  echo "$1" | sed -e "s#$NVM_DIR/[^/]*$2[^:]*:##g" -e "s#:$NVM_DIR/[^/]*$2[^:]*##g" -e "s#$NVM_DIR/[^/]*$2[^:]*##g"
+}
+
+nvm_prepend_path() {
+  if [ -z "$1" ]; then
+    echo "$2"
+  else
+    echo "$2:$1"
+  fi
+}
+
 nvm_binary_available() {
   # binaries started with node 0.8.6
-  local MINIMAL="0.8.6"
-  local VERSION=$1
+  local MINIMAL
+  MINIMAL="0.8.6"
+  local VERSION
+  VERSION=$1
   [ $(nvm_normalize_version $VERSION) -ge $(nvm_normalize_version $MINIMAL) ]
 }
 
 nvm_ls() {
-  local PATTERN=$1
-  local VERSIONS=''
+  local PATTERN
+  PATTERN=$1
+  local VERSIONS
+  VERSIONS=''
   if [ "$PATTERN" = 'current' ]; then
     echo `node -v 2>/dev/null`
     return
@@ -99,23 +138,27 @@ nvm_ls() {
   fi
   # If it looks like an explicit version, don't do anything funny
   if [ `expr "$PATTERN" : "v[[:digit:]]*\.[[:digit:]]*\.[[:digit:]]*$"` != 0 ]; then
-    VERSIONS="$PATTERN"
+    if [ -d "$NVM_DIR/$PATTERN" ]; then
+      VERSIONS="$PATTERN"
+    fi
   else
     VERSIONS=`find "$NVM_DIR/" -maxdepth 1 -type d -name "$(nvm_format_version $PATTERN)*" -exec basename '{}' ';' \
-      | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n`
+      | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n | grep -v '^ *\.'`
   fi
   if [ -z "$VERSIONS" ]; then
-      echo "N/A"
-      return
+    echo "N/A"
+    return 3
   fi
   echo "$VERSIONS"
   return
 }
 
 nvm_ls_remote() {
-  local PATTERN=$1
+  local PATTERN
+  PATTERN=$1
   local VERSIONS
-  local GREP_OPTIONS=''
+  local GREP_OPTIONS
+  GREP_OPTIONS=''
   if [ -n "$PATTERN" ]; then
     PATTERN=`nvm_format_version "$PATTERN"`
   else
@@ -127,7 +170,7 @@ nvm_ls_remote() {
               | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n`
   if [ -z "$VERSIONS" ]; then
     echo "N/A"
-    return
+    return 3
   fi
   echo "$VERSIONS"
   return
@@ -148,7 +191,7 @@ nvm_checksum() {
     echo 'Checksums empty' #missing in raspberry pi binary
     return
   else
-    echo 'Checksums do not match.'
+    echo 'Checksums do not match.' >&2
     return 1
   fi
 }
@@ -156,9 +199,10 @@ nvm_checksum() {
 nvm_print_versions() {
   local VERSION
   local FORMAT
-  local CURRENT=`nvm_version current`
+  local NVM_CURRENT
+  NVM_CURRENT=`nvm_version current`
   echo "$1" | while read VERSION; do
-    if [ "$VERSION" = "$CURRENT" ]; then
+    if [ "$VERSION" = "$NVM_CURRENT" ]; then
       FORMAT='\033[0;32m-> %9s\033[0m'
     elif [ -d "$NVM_DIR/$VERSION" ]; then
       FORMAT='\033[0;34m%12s\033[0m'
@@ -176,10 +220,13 @@ nvm() {
   fi
 
   # Try to figure out the os and arch for binary fetching
-  local uname="$(uname -a)"
-  local os=
-  local arch="$(uname -m)"
-  local GREP_OPTIONS=''
+  local uname
+  uname="$(uname -a)"
+  local os
+  local arch
+  arch="$(uname -m)"
+  local GREP_OPTIONS
+  GREP_OPTIONS=''
   case "$uname" in
     Linux\ *) os=linux ;;
     Darwin\ *) os=darwin ;;
@@ -218,6 +265,7 @@ nvm() {
       echo "    nvm alias <name> <version>  Set an alias named <name> pointing to <version>"
       echo "    nvm unalias <name>          Deletes the alias named <name>"
       echo "    nvm copy-packages <version> Install global NPM packages contained in <version> to current version"
+      echo "    nvm unload                  Unload NVM from shell"
       echo
       echo "Example:"
       echo "    nvm install v0.10.24        Install a specific version number"
@@ -230,7 +278,7 @@ nvm() {
       echo
     ;;
 
-    "install" )
+    "install" | "i" )
       # initialize local variables
       local binavail
       local t
@@ -238,7 +286,8 @@ nvm() {
       local sum
       local tarball
       local nobinary
-      local version_not_provided=0
+      local version_not_provided
+      version_not_provided=0
       local provided_version
 
       if ! nvm_has "curl"; then
@@ -274,7 +323,7 @@ nvm() {
         fi
         provided_version="$NVM_RC_VERSION"
       fi
-      [ -d "$NVM_DIR/$provided_version" ] && echo "$provided_version is already installed." && return
+      [ -d "$NVM_DIR/$provided_version" ] && echo "$provided_version is already installed." >&2 && return
 
       VERSION=`nvm_remote_version $provided_version`
       ADDITIONAL_PARAMETERS=''
@@ -287,7 +336,16 @@ nvm() {
         shift
       done
 
-      [ -d "$NVM_DIR/$VERSION" ] && echo "$VERSION is already installed." && return
+      if [ -d "$NVM_DIR/$VERSION" ]; then
+        echo "$VERSION is already installed." >&2
+        nvm use "$VERSION"
+        return $?
+      fi
+
+      if [ "$VERSION" = "N/A" ]; then
+        echo "Version '$provided_version' not found - try \`nvm ls-remote\` to browse available versions." >&2
+        return 3
+      fi
 
       # skip binary install if no binary option specified.
       if [ $nobinary -ne 1 ]; then
@@ -297,8 +355,10 @@ nvm() {
             t="$VERSION-$os-$arch"
             url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz"
             sum=`curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt | \grep node-${t}.tar.gz | awk '{print $1}'`
-            local tmpdir="$NVM_DIR/bin/node-${t}"
-            local tmptarball="$tmpdir/node-${t}.tar.gz"
+            local tmpdir
+            tmpdir="$NVM_DIR/bin/node-${t}"
+            local tmptarball
+            tmptarball="$tmpdir/node-${t}.tar.gz"
             if (
               mkdir -p "$tmpdir" && \
               curl -L -C - --progress-bar $url -o "$tmptarball" && \
@@ -309,7 +369,7 @@ nvm() {
               )
             then
               nvm use $VERSION
-              return;
+              return $?
             else
               echo "Binary download failed, trying source." >&2
               rm -rf "$tmptarball" "$tmpdir"
@@ -327,8 +387,10 @@ nvm() {
         make='gmake'
         MAKE_CXX="CXX=c++"
       fi
-      local tmpdir="$NVM_DIR/src"
-      local tmptarball="$tmpdir/node-$VERSION.tar.gz"
+      local tmpdir
+      tmpdir="$NVM_DIR/src"
+      local tmptarball
+      tmptarball="$tmpdir/node-$VERSION.tar.gz"
       if [ "`curl -Is "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" | \grep '200 OK'`" != '' ]; then
         tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz"
         sum=`curl -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt | \grep node-$VERSION.tar.gz | awk '{print $1}'`
@@ -352,10 +414,10 @@ nvm() {
         if ! nvm_has "npm" ; then
           echo "Installing npm..."
           if [ "`expr "$VERSION" : '\(^v0\.1\.\)'`" != '' ]; then
-            echo "npm requires node v0.2.3 or higher"
+            echo "npm requires node v0.2.3 or higher" >&2
           elif [ "`expr "$VERSION" : '\(^v0\.2\.\)'`" != '' ]; then
             if [ "`expr "$VERSION" : '\(^v0\.2\.[0-2]$\)'`" != '' ]; then
-              echo "npm requires node v0.2.3 or higher"
+              echo "npm requires node v0.2.3 or higher" >&2
             else
               curl https://npmjs.org/install.sh | clean=yes npm_install=0.2.19 sh
             fi
@@ -364,7 +426,7 @@ nvm() {
           fi
         fi
       else
-        echo "nvm: install $VERSION failed!"
+        echo "nvm: install $VERSION failed!" >&2
         return 1
       fi
     ;;
@@ -372,12 +434,12 @@ nvm() {
       [ $# -ne 2 ] && nvm help && return
       PATTERN=`nvm_format_version $2`
       if [ "$PATTERN" = `nvm_version` ]; then
-        echo "nvm: Cannot uninstall currently-active node version, $PATTERN."
+        echo "nvm: Cannot uninstall currently-active node version, $PATTERN." >&2
         return 1
       fi
       VERSION=`nvm_version $PATTERN`
       if [ ! -d $NVM_DIR/$VERSION ]; then
-        echo "$VERSION version is not installed..."
+        echo "$VERSION version is not installed..." >&2
         return;
       fi
 
@@ -400,68 +462,64 @@ nvm() {
     ;;
     "deactivate" )
       if [ `expr "$PATH" : ".*$NVM_DIR/.*/bin.*"` != 0 ] ; then
-        export PATH=${PATH%$NVM_DIR/*/bin*}${PATH#*$NVM_DIR/*/bin:}
+        export PATH=`nvm_strip_path "$PATH" "/bin"`
         hash -r
         echo "$NVM_DIR/*/bin removed from \$PATH"
       else
-        echo "Could not find $NVM_DIR/*/bin in \$PATH"
+        echo "Could not find $NVM_DIR/*/bin in \$PATH" >&2
       fi
       if [ `expr "$MANPATH" : ".*$NVM_DIR/.*/share/man.*"` != 0 ] ; then
-        export MANPATH=${MANPATH%$NVM_DIR/*/share/man*}${MANPATH#*$NVM_DIR/*/share/man:}
+        export MANPATH=`nvm_strip_path "$MANPATH" "/share/man"`
         echo "$NVM_DIR/*/share/man removed from \$MANPATH"
       else
-        echo "Could not find $NVM_DIR/*/share/man in \$MANPATH"
+        echo "Could not find $NVM_DIR/*/share/man in \$MANPATH" >&2
       fi
       if [ `expr "$NODE_PATH" : ".*$NVM_DIR/.*/lib/node_modules.*"` != 0 ] ; then
-        export NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}${NODE_PATH#*$NVM_DIR/*/lib/node_modules:}
+        export NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"`
         echo "$NVM_DIR/*/lib/node_modules removed from \$NODE_PATH"
       else
-        echo "Could not find $NVM_DIR/*/lib/node_modules in \$NODE_PATH"
+        echo "Could not find $NVM_DIR/*/lib/node_modules in \$NODE_PATH" >&2
       fi
     ;;
     "use" )
       if [ $# -eq 0 ]; then
         nvm help
-        return
+        return 127
       fi
       if [ $# -eq 1 ]; then
         nvm_rc_version
         if [ -n "$NVM_RC_VERSION" ]; then
-            VERSION=`nvm_version $NVM_RC_VERSION`
+          VERSION=`nvm_version $NVM_RC_VERSION`
         fi
       else
         VERSION=`nvm_version $2`
       fi
       if [ -z "$VERSION" ]; then
         nvm help
-        return
+        return 127
       fi
       if [ -z "$VERSION" ]; then
         VERSION=`nvm_version $2`
       fi
       if [ ! -d "$NVM_DIR/$VERSION" ]; then
-        echo "$VERSION version is not installed yet"
+        echo "$VERSION version is not installed yet" >&2
         return 1
       fi
-      if [ `expr "$PATH" : ".*$NVM_DIR/.*/bin"` != 0 ]; then
-        PATH=${PATH%$NVM_DIR/*/bin*}$NVM_DIR/$VERSION/bin${PATH#*$NVM_DIR/*/bin}
-      else
-        PATH="$NVM_DIR/$VERSION/bin:$PATH"
-      fi
+      # Strip other version from PATH
+      PATH=`nvm_strip_path "$PATH" "/bin"`
+      # Prepend current version
+      PATH=`nvm_prepend_path "$PATH" "$NVM_DIR/$VERSION/bin"`
       if [ -z "$MANPATH" ]; then
         MANPATH=$(manpath)
       fi
-      MANPATH=${MANPATH#*$NVM_DIR/*/man:}
-      if [ `expr "$MANPATH" : ".*$NVM_DIR/.*/share/man"` != 0 ]; then
-        MANPATH=${MANPATH%$NVM_DIR/*/share/man*}$NVM_DIR/$VERSION/share/man${MANPATH#*$NVM_DIR/*/share/man}
-      else
-        MANPATH="$NVM_DIR/$VERSION/share/man:$MANPATH"
-      fi
-      if [ `expr "$NODE_PATH" : ".*$NVM_DIR/.*/lib/node_modules.*"` != 0 ]; then
-        NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}$NVM_DIR/$VERSION/lib/node_modules${NODE_PATH#*$NVM_DIR/*/lib/node_modules}
-      else
-        NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules:$NODE_PATH"
-      fi
+      # Strip other version from MANPATH
+      MANPATH=`nvm_strip_path "$MANPATH" "/share/man"`
+      # Prepend current version
+      MANPATH=`nvm_prepend_path "$MANPATH" "$NVM_DIR/$VERSION/share/man"`
+      # Strip other version from NODE_PATH
+      NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"`
+      # Prepend current version
+      NODE_PATH=`nvm_prepend_path "$NODE_PATH" "$NVM_DIR/$VERSION/lib/node_modules"`
       export PATH
       hash -r
       export MANPATH
@@ -472,7 +530,8 @@ nvm() {
     ;;
     "run" )
       local provided_version
-      local has_checked_nvmrc=0
+      local has_checked_nvmrc
+      has_checked_nvmrc=0
       # run given version of node
       shift
       if [ $# -lt 1 ]; then
@@ -484,7 +543,7 @@ nvm() {
         fi
         if [ $VERSION = "N/A" ]; then
           nvm help
-          return
+          return 127
         fi
       fi
 
@@ -503,14 +562,11 @@ nvm() {
       fi
 
       if [ ! -d "$NVM_DIR/$VERSION" ]; then
-        echo "$VERSION version is not installed yet"
-        return;
-      fi
-      if [ `expr "$NODE_PATH" : ".*$NVM_DIR/.*/lib/node_modules.*"` != 0 ]; then
-        RUN_NODE_PATH=${NODE_PATH%$NVM_DIR/*/lib/node_modules*}$NVM_DIR/$VERSION/lib/node_modules${NODE_PATH#*$NVM_DIR/*/lib/node_modules}
-      else
-        RUN_NODE_PATH="$NVM_DIR/$VERSION/lib/node_modules:$NODE_PATH"
+        echo "$VERSION version is not installed yet" >&2
+        return 1
       fi
+      RUN_NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"`
+      RUN_NODE_PATH=`nvm_prepend_path "$NODE_PATH" "$NVM_DIR/$VERSION/lib/node_modules"`
       echo "Running node $VERSION"
       NODE_PATH=$RUN_NODE_PATH $NVM_DIR/$VERSION/bin/node "$@"
     ;;
@@ -522,8 +578,8 @@ nvm() {
       return
     ;;
     "ls-remote" | "list-remote" )
-        nvm_print_versions "`nvm_ls_remote $2`"
-        return
+      nvm_print_versions "`nvm_ls_remote $2`"
+      return
     ;;
     "current" )
       nvm_version current
@@ -537,18 +593,18 @@ nvm() {
             DEST=`cat $ALIAS`
             VERSION=`nvm_version $DEST`
             if [ "$DEST" = "$VERSION" ]; then
-                echo "$(basename $ALIAS) -> $DEST"
+              echo "$(basename $ALIAS) -> $DEST"
             else
-                echo "$(basename $ALIAS) -> $DEST (-> $VERSION)"
+              echo "$(basename $ALIAS) -> $DEST (-> $VERSION)"
             fi
           fi
         done
         return
       fi
       if [ -z "$3" ]; then
-          rm -f $NVM_DIR/alias/$2
-          echo "$2 -> *poof*"
-          return
+        rm -f $NVM_DIR/alias/$2
+        echo "$2 -> *poof*"
+        return
       fi
       mkdir -p $NVM_DIR/alias
       VERSION=`nvm_version $3`
@@ -557,42 +613,48 @@ nvm() {
       fi
       echo $3 > "$NVM_DIR/alias/$2"
       if [ ! "$3" = "$VERSION" ]; then
-          echo "$2 -> $3 (-> $VERSION)"
+        echo "$2 -> $3 (-> $VERSION)"
       else
         echo "$2 -> $3"
       fi
     ;;
     "unalias" )
       mkdir -p $NVM_DIR/alias
-      [ $# -ne 2 ] && nvm help && return
-      [ ! -f "$NVM_DIR/alias/$2" ] && echo "Alias $2 doesn't exist!" && return
+      [ $# -ne 2 ] && nvm help && return 127
+      [ ! -f "$NVM_DIR/alias/$2" ] && echo "Alias $2 doesn't exist!" >&2 && return
       rm -f $NVM_DIR/alias/$2
       echo "Deleted alias $2"
     ;;
     "copy-packages" )
-        if [ $# -ne 2 ]; then
-          nvm help
-          return
-        fi
-        VERSION=`nvm_version $2`
-        local ROOT=`(nvm use $VERSION && npm -g root)`
-        local ROOTDEPTH=$((`echo $ROOT | sed 's/[^\/]//g'|wc -m` -1))
+      if [ $# -ne 2 ]; then
+        nvm help
+        return 127
+      fi
+      VERSION=`nvm_version $2`
+      local ROOT
+      ROOT=`(nvm use $VERSION && npm -g root)`
+      local ROOTDEPTH
+      ROOTDEPTH=$((`echo $ROOT | sed 's/[^\/]//g'|wc -m` -1))
 
-        # declare local INSTALLS first, otherwise it doesn't work in zsh
-        local INSTALLS
-        INSTALLS=`nvm use $VERSION > /dev/null && npm -g -p ll | \grep "$ROOT\/[^/]\+$" | cut -d '/' -f $(($ROOTDEPTH + 2)) | cut -d ":" -f 2 | \grep -v npm | tr "\n" " "`
+      # declare local INSTALLS first, otherwise it doesn't work in zsh
+      local INSTALLS
+      INSTALLS=`nvm use $VERSION > /dev/null && npm -g -p ll | \grep "$ROOT\/[^/]\+$" | cut -d '/' -f $(($ROOTDEPTH + 2)) | cut -d ":" -f 2 | \grep -v npm | tr "\n" " "`
 
-        npm install -g ${INSTALLS[@]}
+      npm install -g ${INSTALLS[@]}
     ;;
     "clear-cache" )
-        rm -f $NVM_DIR/v* 2>/dev/null
-        echo "Cache cleared."
+      rm -f $NVM_DIR/v* 2>/dev/null
+      echo "Cache cleared."
     ;;
     "version" )
-        nvm_version $2
+      nvm_version $2
     ;;
     "--version" )
-        echo "nvm v0.5.0"
+      echo "0.9.0"
+    ;;
+    "unload" )
+      unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version > /dev/null 2>&1
+      unset RC_VERSION NVM_NODEJS_ORG_MIRROR NVM_DIR NVM_CD_FLAGS > /dev/null 2>&1
     ;;
     * )
       nvm help

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.5.0",
+  "version": "0.9.0",
   "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
   "directories": {
     "test": "test"

test/fast/Listing versions/Running "nvm ls" should filter out ".nvm"

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+mkdir ../../../v0.1.3
+mkdir ../../../v0.2.3
+
+. ../../../nvm.sh
+
+[ -z `nvm ls | grep '^ *\.'` ]
+# The result should contain only the appropriate version numbers.

test/fast/Listing versions/Running "nvm ls" with node-like versioning vx.x.x should only list a matched version

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+mkdir ../../../v0.1.2
+
+. ../../../nvm.sh
+
+nvm ls v0.1 | grep v0.1.2 &&
+nvm ls v0.1.2 | grep v0.1.2 &&
+nvm ls v0.1. | grep N/A &&
+nvm ls v0.1.1 | grep N/A

test/fast/Running "nvm deactivate" should unset the nvm environment variables.

@@ -8,7 +8,7 @@ die () { echo $@ ; exit 1; }
 
 . ../../nvm.sh
 nvm use v0.2.3 &&
-[ `expr $PATH : ".*v0.2.3/.*/bin"` != 0 ] || die "Failed to activate v0.2.3"
+[ `expr $PATH : ".*v0.2.3/.*/bin"` != 0 ] && [ `expr $NODE_PATH : ".*v0.2.3/.*/lib/node_modules"` != 0 ] || die "Failed to activate v0.2.3"
 
 nvm deactivate &&
-[ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] || die "Failed to deactivate v0.2.3"
+[ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] && [ `expr $NODE_PATH : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "Failed to deactivate v0.2.3"

test/fast/Running "nvm install" with an invalid version fails nicely

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../nvm.sh
+[ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message"
+

test/fast/Running "nvm unload" should unset all function and variables.

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+fail () { echo $@ ; exit 1; }
+
+. ../../nvm.sh
+
+type nvm > /dev/null 2>&1 || fail "NVM not loaded"
+
+nvm unload
+
+type nvm > /dev/null 2>&1 && fail "NVM not unloaded" || exit 0
+

test/fast/Unit tests/nvm_prepend_path

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+TEST_PATH=/usr/bin:/usr/local/bin
+
+NEW_PATH=`nvm_prepend_path "$TEST_PATH" "$NVM_DIR/v0.2.5/bin"`
+
+[ "$NEW_PATH" = "$NVM_DIR/v0.2.5/bin:/usr/bin:/usr/local/bin" ] || die "Not correctly prepended: $NEW_PATH "
+
+
+EMPTY_PATH=
+
+NEW_PATH=`nvm_prepend_path "$EMPTY_PATH" "$NVM_DIR/v0.2.5/bin"`
+
+[ "$NEW_PATH" = "$NVM_DIR/v0.2.5/bin" ] || die "Not correctly prepended: $NEW_PATH "

test/fast/Unit tests/nvm_strip_path

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+TEST_PATH=$NVM_DIR/v0.10.5/bin:/usr/bin:$NVM_DIR/v0.11.5/bin:$NVM_DIR/v0.9.5/bin:/usr/local/bin:$NVM_DIR/v0.2.5/bin
+
+STRIPPED_PATH=`nvm_strip_path "$TEST_PATH" "/bin"`
+
+[ "$STRIPPED_PATH" = "/usr/bin:/usr/local/bin" ] || die "Not correctly stripped: $STRIPPED_PATH "

test/slow/nvm install/install already installed uses it

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message"
+
+# Remove the stuff we're clobbering.
+[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7
+[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12
+
+# Install from binary
+nvm install 0.9.7
+nvm install 0.9.12
+
+nvm use 0.9.7
+
+node --version | grep v0.9.7 || die "precondition failed: node doesn't start at 0.9.7"
+
+nvm install 0.9.12
+
+node --version | grep v0.9.12 || die "nvm install on already installed version doesn't use it"
+

test/slow/nvm install/install two versions and use the latest one

@@ -9,7 +9,7 @@ set -e
 
 # Install from binary
 nvm install 0.9.7
-nvm install 0.9.12
+nvm i 0.9.12
 
 # Check
 [ -d ../../../v0.9.7 ]

test/slow/nvm run/Running "nvm run" should pick up .nvmrc version

@@ -6,7 +6,8 @@ die () { echo $@ ; exit 1; }
 . ../../../nvm.sh
 
 echo "0.10.7" > .nvmrc
-[ "$(nvm run --version | tail -1)" = "v0.10.7" ] || die "`nvm run` failed to run with the .nvmrc version"
 
-[ "$(nvm run --version | head -1)" = "Found .nvmrc files with version <0.10.7>" ] || die "`nvm run` failed to print out the \"found in .nvmrc\" message"
+[ "$(nvm run --version | tail -1)" = "v0.10.7" ] || die "\`nvm run\` failed to run with the .nvmrc version"
+
+[ "$(nvm run --version | head -1)" = "Found '$PWD/.nvmrc' with version <0.10.7>" ] || die "\`nvm run\` failed to print out the \"found in .nvmrc\" message"