v0.25.4

Use the original ls instead of aliases.
Fixes #755
2025-09-02 18:46:42 +00:00 · 2015-05-29 11:11:40 -07:00 · 2015-05-29 11:11:14 -07:00 · 2015-05-22 15:18:46 -07:00 · 2015-05-22 00:15:43 -07:00 · 2015-05-19 14:05:43 -07:00
130 changed files with 4384 additions and 640 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1 @@
+*.sh eol=lf
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@ test/bak
 .urchin_stdout

 node_modules/
+npm-debug.log

 .DS_Store
 current
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,29 +1,38 @@
 language: c # defaults to ruby
+addons:
+  apt_packages:
+  - zsh
+  - ksh
 install:
-  - sudo apt-get install ksh zsh -y
+  - (mkdir /tmp/urchin && cd /tmp/urchin && curl -s "$(curl -s https://registry.npmjs.com/urchin | grep -Eo '"tarball":\s*"[^"]+"' | tail -n 1 | awk -F\" '{ print $4 }')" -O && tar -x -f urchin*)
+  - chmod +x /tmp/urchin/package/urchin
  - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
-before_script:
-  - '[ -n "$WITHOUT_CURL" ] || curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin'
-  - '[ -z "$WITHOUT_CURL" ] || wget -O /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin'
-  - chmod +x /tmp/urchin
 script:
-  - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin $SHELL
+  - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/urchin test-$SHELL
 env:
+  - SHELL=bash TEST_SUITE=install_script
  - SHELL=sh TEST_SUITE=fast
-  - SHELL=sh TEST_SUITE=fast WITHOUT_CURL=1
  - SHELL=dash TEST_SUITE=fast
-  - SHELL=dash TEST_SUITE=fast WITHOUT_CURL=1
  - SHELL=bash TEST_SUITE=fast
-  - SHELL=bash TEST_SUITE=fast WITHOUT_CURL=1
  - SHELL=zsh TEST_SUITE=fast
-  - SHELL=zsh TEST_SUITE=fast WITHOUT_CURL=1
-  - SHELL=ksh TEST_SUITE=fast
-  - SHELL=ksh TEST_SUITE=fast WITHOUT_CURL=1
+#  - SHELL=ksh TEST_SUITE=fast
  - SHELL=sh TEST_SUITE=slow
-  - SHELL=sh TEST_SUITE=slow WITHOUT_CURL=1
  - SHELL=dash TEST_SUITE=slow
-  - SHELL=dash TEST_SUITE=slow WITHOUT_CURL=1
  - SHELL=bash TEST_SUITE=slow
-  - SHELL=bash TEST_SUITE=slow WITHOUT_CURL=1
  - SHELL=zsh TEST_SUITE=slow
-  - SHELL=zsh TEST_SUITE=slow WITHOUT_CURL=1
+#  - SHELL=ksh TEST_SUITE=slow
+  - SHELL=sh TEST_SUITE=sourcing
+  - SHELL=dash TEST_SUITE=sourcing
+  - SHELL=bash TEST_SUITE=sourcing
+  - SHELL=zsh TEST_SUITE=sourcing
+#  - SHELL=ksh TEST_SUITE=sourcing
+  - SHELL=sh TEST_SUITE=installation
+  - SHELL=sh TEST_SUITE=installation WITHOUT_CURL=1
+  - SHELL=dash TEST_SUITE=installation
+  - SHELL=dash TEST_SUITE=installation WITHOUT_CURL=1
+  - SHELL=bash TEST_SUITE=installation
+  - SHELL=bash TEST_SUITE=installation WITHOUT_CURL=1
+  - SHELL=zsh TEST_SUITE=installation
+  - SHELL=zsh TEST_SUITE=installation WITHOUT_CURL=1
+#  - SHELL=ksh TEST_SUITE=installation
+#  - SHELL=ksh TEST_SUITE=installation WITHOUT_CURL=1
--- a/85
+++ b/85
@@ -1,26 +1,77 @@
-URCHIN=`which urchin`
-SHELLS=sh bash dash ksh zsh
-TEST_SUITE=fast
+	# Since we rely on paths relative to the makefile location, abort if make isn't being run from there.
+$(if $(findstring /,$(MAKEFILE_LIST)),$(error Please only invoke this makefile from the directory it resides in))
+	# Note: With Travis CI:
+	#  - the path to urchin is passed via the command line.
+	#  - the other utilities are NOT needed, so we skip the test for their existence.
+URCHIN := urchin
+ifeq ($(findstring /,$(URCHIN)),) # urchin path was NOT passed in.
+		# Add the local npm packages' bin folder to the PATH, so that `make` can find them, when invoked directly.
+		# Note that rather than using `$(npm bin)` the 'node_modules/.bin' path component is hard-coded, so that invocation works even from an environment
+		# where npm is (temporarily) unavailable due to having deactivated an nvm instance loaded into the calling shell in order to avoid interference with tests.
+	export PATH := $(shell printf '%s' "$$PWD/node_modules/.bin:$$PATH")
+		# The list of all supporting utilities, installed with `npm install`.
+	UTILS := $(URCHIN) replace semver
+		# Make sure that all required utilities can be located.
+	UTIL_CHECK := $(or $(shell PATH="$(PATH)" which $(UTILS) >/dev/null && echo 'ok'),$(error Did you forget to run `npm install` after cloning the repo? At least one of the required supporting utilities not found: $(UTILS)))
+endif
+	# The files that need updating when incrementing the version number.
+VERSIONED_FILES := nvm.sh install.sh README.markdown package.json
+	# Define all shells to test with. Can be overridden with `make SHELLS=... <target>`.
+SHELLS := sh bash dash zsh # ksh (#574)
+	# Generate 'test-<shell>' target names from specified shells.
+	# The embedded shell names are extracted on demand inside the recipes.
+SHELL_TARGETS := $(addprefix test-,$(SHELLS))
+	# Define the default test suite(s). This can be overridden with `make TEST_SUITE=<...>  <target>`.
+	# Test suites are the names of subfolders of './test'.
+TEST_SUITE := $(shell find ./test/* -type d -prune -exec basename {} \;)

-.PHONY: $(SHELLS) test verify-tag release

-$(SHELLS):
-	@printf '\n\033[0;34m%s\033[0m\n' "Running tests in $@"
-	@$@ $(URCHIN) -f test/$(TEST_SUITE)
+# Default target (by virtue of being the first non '.'-prefixed in the file).
+.PHONY: _no-target-specified
+_no-target-specified:
+	$(error Please specify the target to make - `make list` shows targets. Alternatively, use `npm test` to run the default tests; `npm run` shows all tests)

-test: $(SHELLS)
-	@$(URCHIN) -f test/slow 
+# Lists all targets defined in this makefile.
+.PHONY: list
+list:
+	@$(MAKE) -pRrn : -f $(MAKEFILE_LIST) 2>/dev/null | awk -v RS= -F: '/^# File/,/^# Finished Make data base/ {if ($$1 !~ "^[#.]") {print $$1}}' | egrep -v -e '^[^[:alnum:]]' -e '^$@$$' | sort

-default: test
+# Set of test-<shell> targets; each runs the specified test suites for a single shell.
+# Note that preexisting NVM_* variables are unset to avoid interfering with tests, except when running the Travis tests (where NVM_DIR must be passed in and the env. is assumed to be pristine).
+.PHONY: $(SHELL_TARGETS)
+$(SHELL_TARGETS):
+	@shell='$@'; shell=$${shell##*-}; which "$$shell" >/dev/null || { printf '\033[0;31m%s\033[0m\n' "WARNING: Cannot test with shell '$$shell': not found." >&2; exit 0; } && \
+	 printf '\n\033[0;34m%s\033[0m\n' "Running tests in $$shell"; \
+	 [ -z "$$TRAVIS_BUILD_DIR" ] && for v in $$(set | awk -F'=' '$$1 ~ "^NVM_" { print $$1 }'); do unset $$v; done && unset v; \
+	 for suite in $(TEST_SUITE); do $(URCHIN) -f -s $$shell test/$$suite || exit; done

-verify-tag:
+# All-tests target: invokes the specified test suites for ALL shells defined in $(SHELLS).
+.PHONY: test
+test: $(SHELL_TARGETS)
+
+.PHONY: _ensure-tag
+_ensure-tag:
 ifndef TAG
-	$(error TAG is undefined)
+	$(error Please invoke with `make TAG=<new-version> release`, where <new-version> is either an increment specifier (patch, minor, major, prepatch, preminor, premajor, prerelease), or an explicit major.minor.patch version number)
 endif

-release: verify-tag
-	@ OLD_TAG=`git describe --abbrev=0 --tags` && \
-		replace "$${OLD_TAG/v/}" "$(TAG)" -- nvm.sh install.sh README.markdown package.json && \
-		git commit -m "v$(TAG)" nvm.sh install.sh README.markdown package.json && \
-		git tag "v$(TAG)"
+# Ensures that the git workspace is clean.
+.PHONY: _ensure-clean
+_ensure-clean:
+	@[ -z "$$(git status --porcelain --untracked-files=no || echo err)" ] || { echo "Workspace is not clean; please commit changes first." >&2; exit 2; }

+# Makes a release; invoke with `make TAG=<versionOrIncrementSpec> release`.
+.PHONY: release
+release: _ensure-tag _ensure-clean
+	@old_ver=`git describe --abbrev=0 --tags --match 'v[0-9]*.[0-9]*.[0-9]*'` || { echo "Failed to determine current version." >&2; exit 1; }; old_ver=$${old_ver#v}; \
+	 new_ver=`echo "$(TAG)" | sed 's/^v//'`; new_ver=$${new_ver:-patch}; \
+	 if printf "$$new_ver" | grep -q '^[0-9]'; then \
+	   semver "$$new_ver" >/dev/null || { echo 'Invalid version number specified: $(TAG) - must be major.minor.patch' >&2; exit 2; }; \
+	   semver -r "> $$old_ver" "$$new_ver" >/dev/null || { echo 'Invalid version number specified: $(TAG) - must be HIGHER than current one.' >&2; exit 2; } \
+	 else \
+	   new_ver=`semver -i "$$new_ver" "$$old_ver"` || { echo 'Invalid version-increment specifier: $(TAG)' >&2; exit 2; } \
+	 fi; \
+	 printf "=== Bumping version **$$old_ver** to **$$new_ver** before committing and tagging:\n=== TYPE 'proceed' TO PROCEED, anything else to abort: " && read response && [ "$$response" = 'proceed' ] || { echo 'Aborted.' >&2; exit 2; };  \
+	 replace "$$old_ver" "$$new_ver" -- $(VERSIONED_FILES) && \
+	 git commit -m "v$$new_ver" $(VERSIONED_FILES) && \
+	 git tag -a -m "v$$new_ver" "v$$new_ver"
--- a/README.markdown
+++ b/README.markdown
@@ -2,35 +2,44 @@

 ## Installation

-First you'll need to make sure your system has a c++ compiler.  For OSX, XCode will work, for Ubuntu, the build-essential and libssl-dev packages work.
+First you'll need to make sure your system has a c++ compiler. For OSX, XCode will work, for Ubuntu, the build-essential and libssl-dev packages work.
+
+Note: `nvm` does not support Windows (see [#284](https://github.com/creationix/nvm/issues/284)). Two alternatives exist, which are not supported nor developed by us:
+ - [nvmw](https://github.com/hakobera/nvmw)
+ - [nvm-windows](https://github.com/coreybutler/nvm-windows)
+
+Note: `nvm` does not support [Fish] either (see [#303](https://github.com/creationix/nvm/issues/303)). Two alternatives exist, which are not supported nor developed by us:
+ - [nvm-fish-wrapper](https://github.com/passcod/nvm-fish-wrapper)
+ - [nvm-fish](https://github.com/Alex7Kom/nvm-fish) (does not support iojs)

 ### Install script

 To install you could use the [install script][2] using cURL:

-    curl https://raw.githubusercontent.com/creationix/nvm/v0.15.0/install.sh | bash
+    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash

 or Wget:

-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.15.0/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.25.4/install.sh | bash

 <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 `PROFILE` variables. Eg: `curl ... | NVM_DIR=/usr/local/nvm bash` 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 bash` for a global install.

-<sub>*NB. The installer can use Git, curl, or wget to download NVM, whatever is available.*</sub>
+<sub>*NB. The installer can use `git`, `curl`, or `wget` to download `nvm`, whatever is available.*</sub>

 ### Manual install

-For manual install create a folder somewhere in your filesystem with the `nvm.sh` file inside it.  I put mine in a folder called `nvm`.
+For manual install create a folder somewhere in your filesystem with the `nvm.sh` file inside it. I put mine in a folder called `nvm`.

-Or if you have `git` installed, then just clone it:
+Or if you have `git` installed, then just clone it, and check out the latest version:

-    git clone https://github.com/creationix/nvm.git ~/.nvm
+    git clone https://github.com/creationix/nvm.git ~/.nvm && cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`

 To activate nvm, you need to source it from your shell:

-    source ~/.nvm/nvm.sh
+    . ~/.nvm/nvm.sh

 I always add this line to my `~/.bashrc`, `~/.profile`, or `~/.zshrc` file to have it automatically sourced upon login.
 Often I also put in a line to use a specific version of node.
@@ -38,7 +47,7 @@ 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`, `nvm exec`, and `nvm run` will all respect an `.nvmrc` file.
+`nvm use`, `nvm install`, `nvm exec`, `nvm run`, and `nvm which` will all respect an `.nvmrc` file when a version is not supplied.

 To download, compile, and install the latest v0.10.x release of node, do this:

@@ -56,6 +65,26 @@ Or, you can run any arbitrary command in a subshell with the desired version of

    nvm exec 0.10 node --version

+You can also get the path to the executable to where it was installed:
+
+    nvm which 0.10
+
+In place of a version pointer like "0.10", you can use the special default aliases "stable" and "unstable":
+
+    nvm install stable
+    nvm install unstable
+    nvm use stable
+    nvm run unstable --version
+
+If you want to install [io.js](https://github.com/iojs/io.js/):
+
+    nvm install iojs
+
+If you want to use the system-installed version of node, you can use the special default alias "system":
+
+    nvm use system
+    nvm run system --version
+
 If you want to see what versions are installed:

    nvm ls
@@ -70,16 +99,23 @@ To restore your PATH, you can deactivate it.

 To set a default Node version to be used in any new shell, use the alias 'default':

-    nvm alias default 0.10
+    nvm alias default stable

 To use a mirror of the node binaries, set `$NVM_NODEJS_ORG_MIRROR`:

-    export NVM_NODEJS_ORG_MIRROR=http://nodejs.org/dist
+    export NVM_NODEJS_ORG_MIRROR=https://nodejs.org/dist
    nvm install 0.10

-    NVM_NODEJS_ORG_MIRROR=http://nodejs.org/dist nvm install 0.10
+    NVM_NODEJS_ORG_MIRROR=https://nodejs.org/dist nvm install 0.10

-`nvm use` will, by defaut, create a "current" symlink. Set `$NVM_SYMLINK_CURRENT` to any value other than "true" to disable this behavior.
+To use a mirror of the iojs binaries, set `$NVM_IOJS_ORG_MIRROR`:
+
+    export NVM_IOJS_ORG_MIRROR=https://iojs.org/dist
+    nvm install iojs-v1.0.3
+
+    NVM_IOJS_ORG_MIRROR=https://iojs.org/dist nvm install iojs-v1.0.3
+
+`nvm use` will not, by default, create a "current" symlink. Set `$NVM_SYMLINK_CURRENT` to "true" to enable this behavior, which is sometimes useful for IDEs.

 ## License

@@ -129,8 +165,9 @@ Put the above sourcing line just below the sourcing line for NVM in your profile
 nvm

 	$ nvm [tab][tab]
-	alias          copy-packages  help           list           run            uninstall      version
-	clear-cache    deactivate     install        ls             unalias        use
+    alias               deactivate          install             ls                  run                 unload
+    clear-cache         exec                list                ls-remote           unalias             use
+    current             help                list-remote         reinstall-packages  uninstall           version

 nvm alias

@@ -150,17 +187,31 @@ nvm uninstall
 	$ nvm uninstall [tab][tab]
 	my_alias        default        v0.6.21        v0.8.26       v0.10.28

+## Compatibility Issues
+`nvm` will encounter some issues if you have some non-default settings set. (see [#606](/../../issues/606))
+The following are known to cause issues:
+
+Inside `~/.npmrc`
+```
+prefix='some/path'
+```
+Environment Variables:
+```
+$NPM_CONFIG_PREFIX
+$PREFIX
+```
+
 ## Problems

 If you try to install a node version and the installation fails, be sure to delete the node downloads from src (~/.nvm/src/) or you might get an error when trying to reinstall them again or you might get an error like the following:

    curl: (33) HTTP server doesn't seem to support byte ranges. Cannot resume.

-Where's my 'sudo node'? Checkout this link:
+Where's my 'sudo node'? Check out this link:

 https://github.com/creationix/nvm/issues/43

-on Arch Linux and other systems using python3 by default, before running *install* you need to
+On Arch Linux and other systems using python3 by default, before running *install* you need to

      export PYTHON=python2

@@ -169,7 +220,7 @@ 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.15.0/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.25.4/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
-
+[Fish]: http://fishshell.com
--- a/16
+++ b/16
@@ -18,9 +18,11 @@ __nvm_commands ()
  current_word="${COMP_WORDS[COMP_CWORD]}"

  COMMANDS='\
-    help install uninstall use run\
-    ls ls-remote list list-remote deactivate\
-    alias unalias copy-packages clear-cache version'
+    help install uninstall use run exec \
+    alias unalias reinstall-packages \
+    current list ls list-remote ls-remote \
+    clear-cache deactivate unload \
+    version which'

    if [ ${#COMP_WORDS[@]} == 4 ]; then

@@ -55,7 +57,7 @@ __nvm_aliases ()
  declare aliases
  aliases=""
  if [ -d $NVM_DIR/alias ]; then
-    aliases="`cd $NVM_DIR/alias && ls`"
+    aliases="`cd $NVM_DIR/alias && command ls`"
  fi
  echo "${aliases}"
 }
@@ -71,7 +73,7 @@ __nvm ()
  previous_word="${COMP_WORDS[COMP_CWORD-1]}"

  case "$previous_word" in
-  use|run|ls|list|uninstall) __nvm_installed_nodes ;;
+  use|run|exec|ls|list|uninstall) __nvm_installed_nodes ;;
  alias|unalias)  __nvm_alias ;;
  *)              __nvm_commands ;;
  esac
@@ -79,8 +81,8 @@ __nvm ()
  return 0
 }

-# complete is a bash builtin, but recent versions of ZSH come with a function 
-# called bashcompinit that will create a complete in ZSH. If the user is in 
+# complete is a bash builtin, but recent versions of ZSH come with a function
+# called bashcompinit that will create a complete in ZSH. If the user is in
 # ZSH, load and run bashcompinit before calling the complete function.
 if [[ -n ${ZSH_VERSION-} ]]; then
 	autoload -U +X bashcompinit && bashcompinit
--- a/install.sh
+++ b/install.sh
@@ -2,21 +2,52 @@

 set -e

+{ # this ensures the entire script is downloaded #
+
 nvm_has() {
  type "$1" > /dev/null 2>&1
-  return $?
 }

 if [ -z "$NVM_DIR" ]; then
  NVM_DIR="$HOME/.nvm"
 fi

+nvm_latest_version() {
+  echo "v0.25.4"
+}
+
+#
+# Outputs the location to NVM depending on:
+# * The availability of $NVM_SOURCE
+# * The method used ("script" or "git" in the script, defaults to "git")
+# NVM_SOURCE always takes precedence unless the method is "script-nvm-exec"
+#
+nvm_source() {
+  local NVM_METHOD
+  NVM_METHOD="$1"
+  local NVM_SOURCE_URL
+  NVM_SOURCE_URL="$NVM_SOURCE"
+  if [ "_$NVM_METHOD" = "_script-nvm-exec" ]; then
+    NVM_SOURCE_URL="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm-exec"
+  elif [ -z "$NVM_SOURCE_URL" ]; then
+    if [ "_$NVM_METHOD" = "_script" ]; then
+      NVM_SOURCE_URL="https://raw.githubusercontent.com/creationix/nvm/$(nvm_latest_version)/nvm.sh"
+    elif [ "_$NVM_METHOD" = "_git" ] || [ -z "$NVM_METHOD" ]; then
+      NVM_SOURCE_URL="https://github.com/creationix/nvm.git"
+    else
+      echo >&2 "Unexpected value \"$NVM_METHOD\" for \$NVM_METHOD"
+      return 1
+    fi
+  fi
+  echo "$NVM_SOURCE_URL"
+}
+
 nvm_download() {
  if nvm_has "curl"; then
-    curl $*
+    curl -q $*
  elif nvm_has "wget"; then
    # Emulate curl with wget
-    ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
+    ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
                           -e 's/-L //' \
                           -e 's/-I /--server-response /' \
                           -e 's/-s /-q /' \
@@ -27,14 +58,10 @@ nvm_download() {
 }

 install_nvm_from_git() {
-  if [ -z "$NVM_SOURCE" ]; then
-    NVM_SOURCE="https://github.com/creationix/nvm.git"
-  fi
-
  if [ -d "$NVM_DIR/.git" ]; then
-    echo "=> nvm is already installed in $NVM_DIR, trying to update"
+    echo "=> nvm is already installed in $NVM_DIR, trying to update using git"
    printf "\r=> "
-    cd "$NVM_DIR" && (git fetch 2> /dev/null || {
+    cd "$NVM_DIR" && (command git fetch 2> /dev/null || {
      echo >&2 "Failed to update nvm, run 'git fetch' in $NVM_DIR yourself." && exit 1
    })
  else
@@ -42,90 +69,179 @@ install_nvm_from_git() {
    echo "=> Downloading nvm from git to '$NVM_DIR'"
    printf "\r=> "
    mkdir -p "$NVM_DIR"
-    git clone "$NVM_SOURCE" "$NVM_DIR"
+    command git clone "$(nvm_source git)" "$NVM_DIR"
  fi
-  cd $NVM_DIR && git checkout v0.15.0 && git branch -D master || true
+  cd "$NVM_DIR" && command git checkout --quiet $(nvm_latest_version)
+  if [ ! -z "$(cd "$NVM_DIR" && git show-ref refs/heads/master)" ]; then
+    if git branch --quiet 2>/dev/null; then
+      cd "$NVM_DIR" && command git branch --quiet -D master >/dev/null 2>&1
+    else
+      echo >&2 "Your version of git is out of date. Please update it!"
+      cd "$NVM_DIR" && command git branch -D master >/dev/null 2>&1
+    fi
+  fi
+  return
 }

 install_nvm_as_script() {
-  if [ -z "$NVM_SOURCE" ]; then
-    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.15.0/nvm.sh"
-  fi
+  local NVM_SOURCE_LOCAL
+  NVM_SOURCE_LOCAL=$(nvm_source script)
+  local NVM_EXEC_SOURCE
+  NVM_EXEC_SOURCE=$(nvm_source script-nvm-exec)

  # Downloading to $NVM_DIR
  mkdir -p "$NVM_DIR"
  if [ -d "$NVM_DIR/nvm.sh" ]; then
-    echo "=> nvm is already installed in $NVM_DIR, trying to update"
+    echo "=> nvm is already installed in $NVM_DIR, trying to update the script"
  else
    echo "=> Downloading nvm as script to '$NVM_DIR'"
  fi
-  nvm_download -s "$NVM_SOURCE" -o "$NVM_DIR/nvm.sh" || {
-    echo >&2 "Failed to download '$NVM_SOURCE'.."
+  nvm_download -s "$NVM_SOURCE_LOCAL" -o "$NVM_DIR/nvm.sh" || {
+    echo >&2 "Failed to download '$NVM_SOURCE_LOCAL'"
    return 1
  }
+  nvm_download -s "$NVM_EXEC_SOURCE" -o "$NVM_DIR/nvm-exec" || {
+    echo >&2 "Failed to download '$NVM_EXEC_SOURCE'"
+    return 2
+  }
+  chmod a+x "$NVM_DIR/nvm-exec" || {
+    echo >&2 "Failed to mark '$NVM_DIR/nvm-exec' as executable"
+    return 3
+  }
 }

-if [ -z "$METHOD" ]; then
-  # Autodetect install method
-  if nvm_has "git"; then
-    install_nvm_from_git
-  elif nvm_has "nvm_download"; then
-    install_nvm_as_script
-  else
-    echo >&2 "You need git, curl, or wget to install nvm"
-    exit 1
+#
+# Detect profile file if not specified as environment variable
+# (eg: PROFILE=~/.myprofile)
+# The echo'ed path is guaranteed to be an existing file
+# Otherwise, an empty string is returned
+#
+nvm_detect_profile() {
+  if [ -f "$PROFILE" ]; then
+    echo "$PROFILE"
+  elif [ -f "$HOME/.bashrc" ]; then
+    echo "$HOME/.bashrc"
+  elif [ -f "$HOME/.bash_profile" ]; then
+    echo "$HOME/.bash_profile"
+  elif [ -f "$HOME/.zshrc" ]; then
+    echo "$HOME/.zshrc"
+  elif [ -f "$HOME/.profile" ]; then
+    echo "$HOME/.profile"
  fi
-else
-  if [ "$METHOD" = "git" ]; then
+}
+
+#
+# Check whether the user has any globally-installed npm modules in their system
+# Node, and warn them if so.
+#
+nvm_check_global_modules() {
+  command -v npm >/dev/null 2>&1 || return 0
+
+  local NPM_VERSION
+  NPM_VERSION="$(npm --version)"
+  NPM_VERSION="${NPM_VERSION:--1}"
+  [ "${NPM_VERSION%%[!-0-9]*}" -gt 0 ] || return 0
+
+  local NPM_GLOBAL_MODULES
+  NPM_GLOBAL_MODULES="$(
+    npm list -g --depth=0 |
+    sed '/ npm@/d' |
+    sed '/ (empty)$/d'
+  )"
+
+  local MODULE_COUNT
+  MODULE_COUNT="$(
+    printf %s\\n "$NPM_GLOBAL_MODULES" |
+    sed -ne '1!p' |                             # Remove the first line
+    wc -l | tr -d ' '                           # Count entries
+  )"
+
+  if [ $MODULE_COUNT -ne 0 ]; then
+    cat <<-'END_MESSAGE'
+	=> You currently have modules installed globally with `npm`. These will no
+	=> longer be linked to the active version of Node when you install a new node
+	=> with `nvm`; and they may (depending on how you construct your `$PATH`)
+	=> override the binaries of modules installed with `nvm`:
+
+	END_MESSAGE
+    printf %s\\n "$NPM_GLOBAL_MODULES"
+    cat <<-'END_MESSAGE'
+
+	=> If you wish to uninstall them at a later point (or re-install them under your
+	=> `nvm` Nodes), you can remove them from the system Node as follows:
+
+	     $ nvm use system
+	     $ npm uninstall -g a_module
+
+	END_MESSAGE
+  fi
+}
+
+nvm_do_install() {
+  if [ -z "$METHOD" ]; then
+    # Autodetect install method
+    if nvm_has "git"; then
+      install_nvm_from_git
+    elif nvm_has "nvm_download"; then
+      install_nvm_as_script
+    else
+      echo >&2 "You need git, curl, or wget to install nvm"
+      exit 1
+    fi
+  elif [ "~$METHOD" = "~git" ]; then
    if ! nvm_has "git"; then
      echo >&2 "You need git to install nvm"
      exit 1
    fi
    install_nvm_from_git
-  fi
-  if [ "$METHOD" = "script" ]; then
+  elif [ "~$METHOD" = "~script" ]; then
    if ! nvm_has "nvm_download"; then
      echo >&2 "You need curl or wget to install nvm"
      exit 1
    fi
    install_nvm_as_script
  fi
-fi

-echo
-
-# Detect profile file if not specified as environment variable (eg: PROFILE=~/.myprofile).
-if [ -z "$PROFILE" ]; then
-  if [ -f "$HOME/.bash_profile" ]; then
-    PROFILE="$HOME/.bash_profile"
-  elif [ -f "$HOME/.zshrc" ]; then
-    PROFILE="$HOME/.zshrc"
-  elif [ -f "$HOME/.profile" ]; then
-    PROFILE="$HOME/.profile"
-  fi
-fi
-
-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
-    echo "=> Profile not found. Tried ~/.bash_profile, ~/.zshrc, and ~/.profile."
-    echo "=> Create one of them and run this script again"
-  else
-    echo "=> Profile $PROFILE not found"
-    echo "=> Create it (touch $PROFILE) and run this script again"
-  fi
-  echo "   OR"
-  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"
-    printf "$SOURCE_STR\n" >> "$PROFILE"
-  else
-    echo "=> Source string already in $PROFILE"
-  fi
-fi

-echo "=> Close and reopen your terminal to start using nvm"
+  local NVM_PROFILE
+  NVM_PROFILE=$(nvm_detect_profile)
+
+  SOURCE_STR="\nexport NVM_DIR=\"$NVM_DIR\"\n[ -s \"\$NVM_DIR/nvm.sh\" ] && . \"\$NVM_DIR/nvm.sh\"  # This loads nvm"
+
+  if [ -z "$NVM_PROFILE" ] ; then
+    echo "=> Profile not found. Tried $NVM_PROFILE (as defined in \$PROFILE), ~/.bashrc, ~/.bash_profile, ~/.zshrc, and ~/.profile."
+    echo "=> Create one of them and run this script again"
+    echo "=> Create it (touch $NVM_PROFILE) and run this script again"
+    echo "   OR"
+    echo "=> Append the following lines to the correct file yourself:"
+    printf "$SOURCE_STR"
+    echo
+  else
+    if ! grep -qc 'nvm.sh' "$NVM_PROFILE"; then
+      echo "=> Appending source string to $NVM_PROFILE"
+      printf "$SOURCE_STR\n" >> "$NVM_PROFILE"
+    else
+      echo "=> Source string already in $NVM_PROFILE"
+    fi
+  fi
+
+  nvm_check_global_modules
+
+  echo "=> Close and reopen your terminal to start using nvm"
+  nvm_reset
+}
+
+#
+# Unsets the various functions defined
+# during the execution of the install script
+#
+nvm_reset() {
+  unset -f nvm_reset nvm_has nvm_latest_version \
+    nvm_source nvm_download install_nvm_as_script install_nvm_from_git \
+    nvm_detect_profile nvm_check_global_modules nvm_do_install
+}
+
+[ "_$NVM_ENV" = "_testing" ] || nvm_do_install
+
+} # this ensures the entire script is downloaded #
--- a/1
+++ b/1
@@ -11,4 +11,3 @@ else
 fi

 exec $@
-
--- a/nvm.sh
+++ b/nvm.sh
--- a/package.json
+++ b/package.json
@@ -1,14 +1,17 @@
 {
  "name": "nvm",
-  "version": "0.15.0",
+  "version": "0.25.4",
  "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
  "directories": {
    "test": "test"
  },
  "scripts": {
-    "test": "urchin test",
-    "test/fast": "urchin -f test/fast",
-    "test/slow": "urchin -f test/slow"
+    "test": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make test-$shell",
+    "test/fast": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=fast test-$shell",
+    "test/slow": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=slow test-$shell",
+    "test/install_script": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=install_script test-$shell",
+    "test/installation": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=installation test-$shell",
+    "test/sourcing": "shell=$(basename -- $(ps -o comm= $(ps -o ppid= -p $PPID)) | sed 's/^-//'); make TEST_SUITE=sourcing test-$shell"
  },
  "repository": {
    "type": "git",
@@ -27,7 +30,8 @@
  },
  "homepage": "https://github.com/creationix/nvm",
  "devDependencies": {
-    "urchin": "~0.0.2"
+    "replace": "^0.3.0",
+    "semver": "^4.3.4",
+    "urchin": "^0.0.5"
  }
 }
-
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+
+die () { echo $@ ; exit 1; }
+
+if [ -n "$ZSH_VERSION" ]; then
+  # set clobber option in order to test that this does not produce any
+  # incompatibilities
+  setopt noclobber
+fi
+
+nvm alias test-stable-1 0.0.2
+
+nvm alias test-stable-1 | \grep -e "test-stable-1 -> 0.0.2 (-> v0.0.2)" \
+  || die "nvm alias test-stable-1 0.0.2 did not set test-stable-1 to 0.0.2"
+
+nvm alias test-stable-1 0.0.1
+
+nvm alias test-stable-1 | \grep -e "test-stable-1 -> 0.0.1 (-> v0.0.1)" \
+  || die "nvm alias test-stable-1 0.0.1 did not set test-stable-1 to 0.0.1"
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -1,4 +1,4 @@
 #!/bin/sh

 . ../../../nvm.sh
-[ $(nvm alias test1 | wc -l) = '2' ]
+[ $(nvm alias test-stable-1 | wc -l) = '2' ]
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+
+die () { echo $@ ; exit 1; }
+
+NVM_ALIAS_OUTPUT=$(nvm alias)
+
+EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
+STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^stable -> $EXPECTED_STABLE (-> $STABLE_VERSION) (default)$" \
+  || die "nvm alias did not contain the default local stable node version"
+
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^node -> stable (-> $STABLE_VERSION) (default)$" \
+  || die "nvm alias did not contain the default local stable node version under 'node'"
+
+EXPECTED_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
+UNSTABLE_VERSION="$(nvm_version "$EXPECTED_UNSTABLE")"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^unstable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION) (default)$" \
+  || die "nvm alias did not contain the default local unstable node version"
+
+EXPECTED_IOJS="$(nvm_print_implicit_alias local iojs)"
+IOJS_VERSION="$(nvm_version "$EXPECTED_IOJS")"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^iojs -> $EXPECTED_IOJS (-> $IOJS_VERSION) (default)$" \
+  || die "nvm alias did not contain the default local iojs version"
+
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+cleanup () {
+  rm -rf ../../../alias/stable
+  rm -rf ../../../alias/unstable
+  rm -rf ../../../alias/node
+  rm -rf ../../../alias/iojs
+  rm -rf ../../../v0.8.1
+  rm -rf ../../../v0.9.1
+  rm -rf ../../../versions/io.js/v0.2.1
+}
+
+mkdir ../../../v0.8.1
+mkdir ../../../v0.9.1
+mkdir -p ../../../versions/io.js/v0.2.1
+
+EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
+STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
+
+EXPECTED_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
+UNSTABLE_VERSION="$(nvm_version "$EXPECTED_UNSTABLE")"
+
+[ "_$STABLE_VERSION" != "_$UNSTABLE_VERSION" ] \
+  || die "stable and unstable versions are the same!"
+
+nvm alias stable "$EXPECTED_UNSTABLE"
+nvm alias unstable "$EXPECTED_STABLE"
+nvm alias node stable
+nvm alias iojs unstable
+
+NVM_ALIAS_OUTPUT=$(nvm alias)
+
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^stable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'stable' alias"
+
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^unstable -> $EXPECTED_STABLE (-> $STABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'unstable' alias"
+
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^node -> stable (-> $UNSTABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'node' alias"
+
+echo "$NVM_ALIAS_OUTPUT" | command grep -e "^iojs -> unstable (-> $STABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'iojs' alias"
+
+cleanup
+
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -1,4 +1,48 @@
 #!/bin/sh

 . ../../../nvm.sh
-[ $(nvm alias | wc -l) = '10' ]
+
+die () { echo $@ ; exit 1; }
+
+NVM_ALIAS_OUTPUT=$(nvm alias)
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-1 -> 0.0.1 (-> v0.0.1)$' \
+  || die "did not find test-stable-1 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-2 -> 0.0.2 (-> v0.0.2)$' \
+  || die "did not find test-stable-2 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-3 -> 0.0.3 (-> v0.0.3)$' \
+  || die "did not find test-stable-3 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-4 -> 0.0.4 (-> v0.0.4)$' \
+  || die "did not find test-stable-4 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-5 -> 0.0.5 (-> v0.0.5)$' \
+  || die "did not find test-stable-5 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-6 -> 0.0.6 (-> v0.0.6)$' \
+  || die "did not find test-stable-6 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-7 -> 0.0.7 (-> v0.0.7)$' \
+  || die "did not find test-stable-7 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-8 -> 0.0.8 (-> v0.0.8)$' \
+  || die "did not find test-stable-8 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-9 -> 0.0.9 (-> v0.0.9)$' \
+  || die "did not find test-stable-9 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-stable-10 -> 0.0.10 (-> v0.0.10)$' \
+  || die "did not find test-stable-10 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-1 -> 0.1.1 (-> v0.1.1)$' \
+  || die "did not find test-unstable-1 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-2 -> 0.1.2 (-> v0.1.2)$' \
+  || die "did not find test-unstable-2 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-3 -> 0.1.3 (-> v0.1.3)$' \
+  || die "did not find test-unstable-3 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-4 -> 0.1.4 (-> v0.1.4)$' \
+  || die "did not find test-unstable-4 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-5 -> 0.1.5 (-> v0.1.5)$' \
+  || die "did not find test-unstable-5 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-6 -> 0.1.6 (-> v0.1.6)$' \
+  || die "did not find test-unstable-6 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-7 -> 0.1.7 (-> v0.1.7)$' \
+  || die "did not find test-unstable-7 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-8 -> 0.1.8 (-> v0.1.8)$' \
+  || die "did not find test-unstable-8 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-9 -> 0.1.9 (-> v0.1.9)$' \
+  || die "did not find test-unstable-9 alias"
+echo "$NVM_ALIAS_OUTPUT" | \grep -e '^test-unstable-10 -> 0.1.10 (-> v0.1.10)$' \
+  || die "did not find test-unstable-10 alias"
+
--- a/test/fast/Aliases/circular/nvm_resolve_alias
+++ b/test/fast/Aliases/circular/nvm_resolve_alias
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../../nvm.sh
+
+ALIAS="$(nvm_resolve_alias loopback)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_alias loopback was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias loopback)"
+EXPECTED_OUTPUT="loopback -> loopback (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias loopback was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_alias one)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_alias one was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias one)"
+EXPECTED_OUTPUT="one -> two (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias one was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_alias two)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_alias two was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias two)"
+EXPECTED_OUTPUT="two -> three (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias two was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_alias three)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_alias three was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias three)"
+EXPECTED_OUTPUT="three -> one (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias three was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_alias four)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_alias four was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias four)"
+EXPECTED_OUTPUT="four -> two (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias four was not $EXPECTED_OUTPUT; got $OUTPUT"
+
--- a/test/fast/Aliases/circular/nvm_resolve_local_alias
+++ b/test/fast/Aliases/circular/nvm_resolve_local_alias
@@ -0,0 +1,36 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../../nvm.sh
+
+ALIAS="$(nvm_resolve_local_alias loopback)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias loopback was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias loopback)"
+EXPECTED_OUTPUT="loopback -> loopback (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias loopback was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias one)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias one was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias one)"
+EXPECTED_OUTPUT="one -> two (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias one was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias two)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias two was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias two)"
+EXPECTED_OUTPUT="two -> three (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias two was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias three)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias three was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias three)"
+EXPECTED_OUTPUT="three -> one (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias three was not $EXPECTED_OUTPUT; got $OUTPUT"
+
+ALIAS="$(nvm_resolve_local_alias four)"
+[ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias four was not ∞; got $ALIAS"
+OUTPUT="$(nvm alias four)"
+EXPECTED_OUTPUT="four -> two (-> ∞)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm alias four was not $EXPECTED_OUTPUT; got $OUTPUT"
+
--- a/test/fast/Aliases/circular/setup
+++ b/test/fast/Aliases/circular/setup
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+echo loopback > ../../../../alias/loopback
+
+echo two > ../../../../alias/one
+echo three > ../../../../alias/two
+echo one > ../../../../alias/three
+
+echo two > ../../../../alias/four
+
--- a/test/fast/Aliases/circular/teardown
+++ b/test/fast/Aliases/circular/teardown
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+rm -f ../../../../alias/loopback
+
+rm -f ../../../../alias/one
+rm -f ../../../../alias/two
+rm -f ../../../../alias/three
+
+rm -f ../../../../alias/four
+
--- a/test/fast/Aliases/nvm_ensure_default_set
+++ b/test/fast/Aliases/nvm_ensure_default_set
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm alias default 0.1 >/dev/null || die "'nvm alias default 0.1' failed"
+
+nvm_ensure_default_set 0.3 || die "'nvm_ensure_default_set' with an existing default alias exits 0"
+
+nvm unalias default || die "'nvm unalias default' failed"
+
+OUTPUT="$(nvm_ensure_default_set 0.2)"
+EXPECTED_OUTPUT="Creating default alias: default -> 0.2 (-> iojs-v0.2.10)"
+EXIT_CODE="$?"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set 0.2' did not output '$EXPECTED_OUTPUT', got '$OUTPUT'"
+[ "_$EXIT_CODE" = "_0" ] || die "'nvm_ensure_default_set 0.2' did not exit with 0, got $EXIT_CODE"
--- a/test/fast/Aliases/nvm_resolve_alias
+++ b/test/fast/Aliases/nvm_resolve_alias
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXIT_CODE=$(nvm_resolve_alias ; echo $?)
+[ $EXIT_CODE = "1" ] || die "nvm_resolve_alias without an argument did not return 1; got $EXIT_CODE"
+
+for i in $(seq 1 10)
+  do
+  STABLE_ALIAS="$(nvm_resolve_alias test-stable-$i)"
+  [ "_$STABLE_ALIAS" = "_v0.0.$i" ] \
+    || die "'nvm_resolve_alias test-stable-$i' was not v0.0.$i; got $STABLE_ALIAS"
+  UNSTABLE_ALIAS="$(nvm_resolve_alias test-unstable-$i)"
+  [ "_$UNSTABLE_ALIAS" = "_v0.1.$i" ] \
+    || die "'nvm_resolve_alias test-unstable-$i' was not v0.1.$i; got $UNSTABLE_ALIAS"
+done
+
+EXIT_CODE=$(nvm_resolve_alias nonexistent ; echo $?)
+[ $EXIT_CODE = "2" ] || die "'nvm_resolve_alias nonexistent' did not return 2; got $EXIT_CODE"
+
+STABLE="$(nvm_resolve_alias stable)"
+[ "_$STABLE" = "_v0.0" ] || die "'nvm_resolve_alias stable' was not v0.0; got $STABLE"
+
+NODE="$(nvm_resolve_alias node)"
+[ "_$NODE" = "_stable" ] || die "'nvm_resolve_alias node' was not stable; got $NODE"
+
+UNSTABLE="$(nvm_resolve_alias unstable)"
+[ "_$UNSTABLE" = "_v0.1" ] || die "'nvm_resolve_alias unstable' was not v0.1; got $UNSTABLE"
+
+IOJS="$(nvm_resolve_alias iojs)"
+[ "_$IOJS" = "_iojs-v0.2" ] || die "'nvm_resolve_alias iojs' was not iojs-v0.2; got $IOJS"
--- a/test/fast/Aliases/nvm_resolve_local_alias
+++ b/test/fast/Aliases/nvm_resolve_local_alias
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXIT_CODE=$(nvm_resolve_local_alias ; echo $?)
+[ "_$EXIT_CODE" = "_1" ] || die "nvm_resolve_local_alias without an argument did not return 1; got $EXIT_CODE"
+
+for i in $(seq 1 10)
+  do
+  STABLE_ALIAS="$(nvm_resolve_local_alias test-stable-$i)"
+  [ "_$STABLE_ALIAS" = "_v0.0.$i" ] \
+    || die "'nvm_resolve_local_alias test-stable-$i' was not v0.0.$i; got $STABLE_ALIAS"
+  UNSTABLE_ALIAS="$(nvm_resolve_local_alias test-unstable-$i)"
+  [ "_$UNSTABLE_ALIAS" = "_v0.1.$i" ] \
+    || die "'nvm_resolve_local_alias test-unstable-$i' was not v0.1.$i; got $UNSTABLE_ALIAS"
+done
+
+OUTPUT="$(nvm_resolve_local_alias nonexistent)"
+EXIT_CODE=$(nvm_resolve_local_alias nonexistent > /dev/null 2>&1 ; echo $?)
+[ "_$EXIT_CODE" = "_2" ] || die "'nvm_resolve_local_alias nonexistent' did not return 2; got $EXIT_CODE"
+[ "_$OUTPUT" = "_" ] || die "'nvm_resolve_local_alias nonexistent' did not have empty output; got $OUTPUT"
+
+STABLE="$(nvm_resolve_local_alias stable)"
+[ "_$STABLE" = "_v0.0.10" ] || die "'nvm_resolve_local_alias stable' was not v0.0.10; got $STABLE"
+
+NODE="$(nvm_resolve_local_alias node)"
+[ "_$NODE" = "_v0.0.10" ] || die "'nvm_resolve_local_alias node' was not v0.0.10; got $NODE"
+
+UNSTABLE="$(nvm_resolve_local_alias unstable)"
+[ "_$UNSTABLE" = "_v0.1.10" ] || die "'nvm_resolve_local_alias unstable' was not v0.1.10; got $UNSTABLE"
+
+IOJS="$(nvm_resolve_local_alias iojs)"
+[ "_$IOJS" = "_iojs-v0.2.10" ] || die "'nvm_resolve_local_alias iojs' was not iojs-v0.2.10; got $IOJS"
--- a/test/fast/Aliases/setup
+++ b/test/fast/Aliases/setup
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+for i in $(seq 1 10)
+  do
+  echo 0.0.$i > ../../../alias/test-stable-$i
+  mkdir -p ../../../v0.0.$i
+  echo 0.1.$i > ../../../alias/test-unstable-$i
+  mkdir -p ../../../v0.1.$i
+  echo 0.2.$i > ../../../alias/test-iojs-$i
+  mkdir -p ../../../versions/io.js/v0.2.$i
+done
--- a/test/fast/Aliases/setup_dir
+++ b/test/fast/Aliases/setup_dir
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-for i in $(seq 1 10)
-  do
-  echo v0.0.$i > ../../../alias/test$i
-done
--- a/test/fast/Aliases/teardown
+++ b/test/fast/Aliases/teardown
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+for i in $(seq 1 10)
+  do
+  rm -f "../../../alias/test-stable-$i"
+  rm -rf "../../../v0.0.$i"
+  rm -f "../../../alias/test-unstable-$i"
+  rm -rf "../../../v0.1.$i"
+  rm -rf "../../../alias/test-iojs-$i"
+  rm -rf "../../../versions/io.js/v0.2.$i"
+done
+
+rm -f "../../../alias/stable"
+rm -f "../../../alias/unstable"
+rm -f "../../../alias/node"
+rm -f "../../../alias/iojs"
+rm -f "../../../alias/default"
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+mkdir -p ../../../v0.0.2
+mkdir -p ../../../v0.0.20
+mkdir -p ../../../versions/node/v0.12.0
+
+. ../../../nvm.sh
+
+die () { echo $@ ; exit 1; }
+
+# The result should contain only the appropriate version numbers.
+
+nvm which 0.0.2 || die "v0.0.2 not found"
+NVM_BIN="$(nvm which 0.0.2)"
+[ "_$NVM_BIN" = "_$(nvm_version_path v0.0.2)/bin/node" ] \
+  || die "'nvm which 0.0.2' did not contain the correct path: got '$NVM_BIN'"
+
+nvm which 0.0.20 || die "v0.0.20 not found"
+NVM_BIN="$(nvm which 0.0.20)"
+[ "_$NVM_BIN" = "_$(nvm_version_path v0.0.20)/bin/node" ] \
+  || die "'nvm which 0.20.0' did not contain the correct path: got '$NVM_BIN'"
+
+nvm which 0.12.0 || die "v0.0.20 not found"
+NVM_BIN="$(nvm which 0.12.0)"
+[ "_$NVM_BIN" = "_$(nvm_version_path v0.12.0)/bin/node" ] \
+  || die "'nvm which 0.12.0' did not contain the correct path: got '$NVM_BIN'"
+
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,6 @@
+ #!/bin/sh
+
+. ../../../nvm.sh
+
+nvm which nonexistent_version
+[ "_$?" = "_1" ]
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,3 @@
+rmdir ../../../v0.0.2 >/dev/null 2>&1
+rmdir ../../../v0.0.20 >/dev/null 2>&1
+rmdir ../../../v0.12.0 >/dev/null 2>&1
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+mkdir ../../../v0.0.2
+mkdir ../../../v0.0.20
+
+. ../../../nvm.sh
+
+die () { echo $@ ; exit 1; }
+
+# The result should contain only the appropriate version numbers.
+
+nvm ls 0.0.2 | grep 'v0.0.2' > /dev/null
+if [ $? -eq 0 ]; then
+  echo '"nvm ls 0.0.2" contained v0.0.2'
+fi
+
+nvm ls 0.0.2 | grep 'v0.0.20' > /dev/null
+if [ $? -eq 0 ]; then
+  die '"nvm ls 0.0.2" contained v0.0.20'
+fi
+
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -2,6 +2,6 @@

 . ../../../nvm.sh

-nvm ls node
+nvm ls io
 [ "$?" = "3" ]

--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,7 @@
+ #!/bin/sh
+
+. ../../../nvm.sh
+
+nvm ls node_
+[ "$?" = "3" ]
+
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,29 @@
+ #!/bin/sh
+
+. ../../../nvm.sh
+
+die () { echo $@ ; exit 1; }
+
+mkdir ../../../v0.2.3
+mkdir ../../../v0.3.3
+
+EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
+STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
+
+EXPECTED_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
+UNSTABLE_VERSION="$(nvm_version "$EXPECTED_UNSTABLE")"
+
+nvm ls stable | \grep "$STABLE_VERSION" >/dev/null \
+  || die "expected 'nvm ls stable' to give $STABLE_VERSION, got $(nvm ls stable)"
+
+nvm ls unstable | \grep "$UNSTABLE_VERSION" >/dev/null \
+  || die "expected 'nvm ls unstable' to give $UNSTABLE_VERSION, got $(nvm ls unstable)"
+
+mkdir ../../../v0.1.2
+nvm alias stable 0.1
+
+nvm ls stable | \grep -v "$STABLE_VERSION" >/dev/null \
+  || die "'nvm ls stable' contained $STABLE_VERSION instead of v0.1.2"
+nvm ls stable | \grep v0.1.2 >/dev/null \
+  || die "'nvm ls stable' did not contain v0.1.2"
+
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+mkdir -p ../../../v0.0.1
+mkdir -p ../../../v0.0.3
+mkdir -p ../../../v0.0.9
+mkdir -p ../../../v0.3.1
+mkdir -p ../../../v0.3.3
+mkdir -p ../../../v0.3.9
+
+nvm_has_system_node() { return 0; }
+nvm ls system | grep system 2>&1 > /dev/null
+[ $? -eq 0 ] || die '"nvm ls system" did not contain "system" when system node is present'
+
+nvm_has_system_node() { return 1; }
+nvm ls system | grep system 2>&1 > /dev/null
+[ $? -ne 0 ] || die '"nvm ls system" contained "system" when system node is not present'
+
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -8,11 +8,17 @@ mkdir ../../../v0.0.9
 mkdir ../../../v0.3.1
 mkdir ../../../v0.3.3
 mkdir ../../../v0.3.9
+mkdir -p ../../../versions/node/v0.12.87
+mkdir -p ../../../versions/node/v0.12.9
+mkdir -p ../../../versions/io.js/v0.1.2
+mkdir -p ../../../versions/io.js/v0.10.2

 # The result should contain the version numbers.
-nvm ls | grep v0.0.1 &&
-nvm ls | grep v0.0.3 &&
-nvm ls | grep v0.0.9 &&
-nvm ls | grep v0.3.1 &&
-nvm ls | grep v0.3.3 &&
-nvm ls | grep v0.3.9
+nvm ls | grep v0.0.1 >/dev/null &&
+nvm ls | grep v0.0.3 >/dev/null &&
+nvm ls | grep v0.0.9 >/dev/null &&
+nvm ls | grep v0.3.1 >/dev/null &&
+nvm ls | grep v0.3.3 >/dev/null &&
+nvm ls | grep v0.3.9 >/dev/null &&
+nvm ls | grep v0.12.87 >/dev/null &&
+nvm ls | grep iojs-v0.1.2 >/dev/null
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -2,13 +2,10 @@

 mkdir ../../../v0.1.3
 mkdir ../../../v0.2.3
+mkdir -p ../../../versions/node

 . ../../../nvm.sh

-mkdir ../../../versions
-
 [ -z "$(nvm ls | \grep 'versions')" ]
 # The result should contain only the appropriate version numbers.

-rmdir ../../../versions
-
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -2,7 +2,7 @@

 die () { echo $@ ; exit 1; }

-mkdir -p ../../../versions/v0.12.1
+mkdir -p ../../../versions/node/v0.12.1
 mkdir ../../../v0.1.3

 . ../../../nvm.sh
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -6,6 +6,6 @@ mkdir ../../../v0.1.2

 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. | grep v0.1.2 &&
 nvm ls v0.1.1 | grep N/A

--- a/versions/teardown
+++ b/versions/teardown
@@ -1,12 +1,17 @@
-rmdir ../../../v0.0.1
-rmdir ../../../v0.0.3
-rmdir ../../../v0.0.9
-rmdir ../../../v0.1.2
-rmdir ../../../v0.1.3
-rmdir ../../../v0.2.3
-rmdir ../../../v0.3.1
-rmdir ../../../v0.3.3
-rmdir ../../../v0.3.9
-rmdir ../../../versions
-unalias nvm_has_system_node
+rmdir ../../../v0.0.1 >/dev/null 2>&1
+rmdir ../../../v0.0.2 >/dev/null 2>&1
+rmdir ../../../v0.0.3 >/dev/null 2>&1
+rmdir ../../../v0.0.9 >/dev/null 2>&1
+rmdir ../../../v0.0.20 >/dev/null 2>&1
+rmdir ../../../v0.1.2 >/dev/null 2>&1
+rmdir ../../../v0.1.3 >/dev/null 2>&1
+rmdir ../../../v0.2.3 >/dev/null 2>&1
+rmdir ../../../v0.3.1 >/dev/null 2>&1
+rmdir ../../../v0.3.3 >/dev/null 2>&1
+rmdir ../../../v0.3.9 >/dev/null 2>&1
+rmdir ../../../v0.20.3 >/dev/null 2>&1
+rmdir ../../../versions >/dev/null 2>&1
+unalias nvm_has_system_node >/dev/null 2>&1
+rm -f ../../../alias/stable >/dev/null 2>&1
+rm -f ../../../alias/unstable >/dev/null 2>&1

--- a/test/fast/Running
+++ b/test/fast/Running
@@ -7,8 +7,11 @@ die () { echo $@ ; exit 1; }
 [ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2

 . ../../nvm.sh
-nvm use 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 use v0.2.3 || die "Failed to activate v0.2.3"
+[ `expr "$PATH" : ".*v0.2.3/.*/bin"` != 0 ] || die "PATH not set up properly"
+[ `expr "$NODE_PATH" : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "NODE_PATH should not contain (npm root -g)"
+# ^ note: NODE_PATH should not contain `npm root -g` since globals should not be requireable

-nvm deactivate &&
-[ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] && [ `expr $NODE_PATH : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "Failed to deactivate v0.2.3"
+nvm deactivate || die "Failed to deactivate v0.2.3"
+[ `expr "$PATH" : ".*v0.2.3/.*/bin"` = 0 ] || die "PATH not cleaned properly"
+[ `expr "$NODE_PATH" : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "NODE_PATH not cleaned properly"
--- a/test/fast/Running
+++ b/test/fast/Running
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+cleanup () {
+  rm -rf ../../v0.10.4
+}
+
+mkdir ../../v0.10.4
+
+. ../../nvm.sh
+
+nvm deactivate >/dev/null 2>&1
+
+INSTALL_ERROR_MSG="$(nvm install v0.10.5 --reinstall-packages-from=0.11 2>&1)"
+EXPECTED_ERROR_MSG="If --reinstall-packages-from is provided, it must point to an installed version of node."
+[ "~$INSTALL_ERROR_MSG" = "~$EXPECTED_ERROR_MSG" ] \
+  || die ""nvm install --reinstall-packages-from" should fail when given an uninstalled version: expected '$EXPECTED_ERROR_MSG', got '$INSTALL_ERROR_MSG'"
+
+INSTALL_EXIT_CODE="$(nvm install v0.10.5 --reinstall-packages-from=0.11 >/dev/null 2>&1; echo $?)"
+[ "~$INSTALL_EXIT_CODE" = "~5" ] \
+  || die ""nvm install --reinstall-packages-from" should exit with code 5 when given an uninstalled version, got $INSTALL_EXIT_CODE"
+
+INSTALL_ERROR_MSG="$(nvm install v0.10.5 --reinstall-packages-from=0.10.5 2>&1)"
+EXPECTED_ERROR_MSG="You can't reinstall global packages from the same version of node you're installing."
+[ "~$INSTALL_ERROR_MSG" = "~$EXPECTED_ERROR_MSG" ] \
+  || die ""nvm install --reinstall-packages-from" should fail when given the same version: expected '$EXPECTED_ERROR_MSG', got '$INSTALL_ERROR_MSG'"
+
+INSTALL_EXIT_CODE="$(nvm install v0.10.5 --reinstall-packages-from=0.10.5 >/dev/null 2>&1; echo $?)"
+[ "~$INSTALL_EXIT_CODE" = "~4" ] \
+  || die ""nvm install --reinstall-packages-from" should exit with code 4 when given the same version, got $INSTALL_EXIT_CODE"
+
--- a/test/fast/Running
+++ b/test/fast/Running
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  rm -rf ../../alias/foo
+}
+
+. ../../nvm.sh
+
+echo 'foo' > ../../alias/foo
+
+OUTPUT="$(nvm use foo 2>&1)"
+EXPECTED_OUTPUT='The alias "foo" leads to an infinite loop. Aborting.'
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
+  || die "'nvm use foo' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
+
+EXIT_CODE="$(nvm use foo 2>/dev/null ; echo $?)"
+[ "_$EXIT_CODE" = "_8" ] || die "Expected exit code 8; got $EXIT_CODE"
+
+cleanup;
+
--- a/test/fast/Running
+++ b/test/fast/Running
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  rm -rf ../../alias/foo
+}
+
+. ../../nvm.sh
+
+echo 'foo' > ../../alias/foo
+
+OUTPUT="$(nvm use foo 2>&1)"
+EXPECTED_OUTPUT='The alias "foo" leads to an infinite loop. Aborting.'
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
+  || die "'nvm use foo' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
+
+EXIT_CODE="$(nvm use foo 2>/dev/null ; echo $?)"
+[ "_$EXIT_CODE" = "_8" ] || die "Expected exit code 8; got $EXIT_CODE"
+
+cleanup;
+
--- a/test/fast/Running
+++ b/test/fast/Running
@@ -5,9 +5,13 @@ die () { echo $@ ; exit 1; }
 . ../../nvm.sh

 nvm_has_system_node() { return 0; }
-[ "$(nvm use system 2>&1 | tail -n1)" = "Now using system version of node: $(node -v)." ] || die "Could not use system version of node"
+nvm_print_npm_version() { return ' (npm v1.2.3)'; }
+EXPECTED_OUTPUT="Now using system version of node: $(node -v)$(nvm_print_npm_version)"
+[ "$(nvm use system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Could not use system version of node"

 nvm_has_system_node() { return 1; }
-[ "$(nvm use system 2>&1 | tail -n1)" = "System version of node not found." ] || die "Did not report error, system node not found"
+nvm_print_npm_version() { return ''; }
+EXPECTED_OUTPUT="System version of node not found."
+[ "$(nvm use system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Did not report error, system node not found"
 nvm use system 2>&1 > /dev/null || [ $? -eq 127 ] || die "Did not return error code, system node not found"

--- a/test/fast/Running
+++ b/test/fast/Running
@@ -1,5 +1,6 @@
 #!/bin/bash

+export NVM_SYMLINK_CURRENT=true
 . ../../nvm.sh

 rm -rf ../../v0.10.29
--- a/test/fast/Running
+++ b/test/fast/Running
@@ -34,7 +34,7 @@ function cleanup() {

 function runNvmUse() {
  mkdir ../../${TEST_NODE_VERSION}
-  nvm use ${TEST_NODE_VERSION} &> /dev/null
+  nvm use ${TEST_NODE_VERSION} > /dev/null 2>&1
  rmdir ../../${TEST_NODE_VERSION}
 }

@@ -45,39 +45,40 @@ function isCurrentSymlinkPresent() {
 NVM_SYMLINK_CURRENT=false
 cleanup
 runNvmUse
-isCurrentSymlinkPresent && echo "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=false!"
+isCurrentSymlinkPresent && echo >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=false!"
 registerExpectedNoSymlink $?

 NVM_SYMLINK_CURRENT=true
 cleanup
 runNvmUse
-isCurrentSymlinkPresent || echo "Expected 'current' symlink to be created when NVM_SYMLINK_CURRENT=true!"
+isCurrentSymlinkPresent || echo >&2 "Expected 'current' symlink to be created when NVM_SYMLINK_CURRENT=true!"
 registerExpectedSymlink $?

 NVM_SYMLINK_CURRENT=garbagevalue
 cleanup
 runNvmUse
-isCurrentSymlinkPresent && echo "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT contains a string!"
+isCurrentSymlinkPresent && echo >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT contains a string!"
 registerExpectedNoSymlink $?

 NVM_SYMLINK_CURRENT=0
 cleanup
 runNvmUse
-isCurrentSymlinkPresent && echo "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=0!"
+isCurrentSymlinkPresent && echo >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=0!"
 registerExpectedNoSymlink $?

 NVM_SYMLINK_CURRENT=1
 cleanup
 runNvmUse
-isCurrentSymlinkPresent && echo "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=1!"
+isCurrentSymlinkPresent && echo >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=1!"
 registerExpectedNoSymlink $?

 unset NVM_SYMLINK_CURRENT
 cleanup
 runNvmUse
-isCurrentSymlinkPresent || echo "Expected 'current' symlink to be created when NVM_SYMLINK_CURRENT has been unset (default behaviour)!"
-registerExpectedSymlink $?
+isCurrentSymlinkPresent && echo >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT has been unset (default behaviour)!"
+registerExpectedNoSymlink $?

 cleanup

 [ ${TEST_FAILED} -ne 0 ] && echo "${TEST_COUNT} tested, ${TEST_PASSED} passed, ${TEST_FAILED} failed" && exit 1 || true
+
--- a/tests/nvm_add_iojs_prefix
+++ b/tests/nvm_add_iojs_prefix
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "_$(nvm_add_iojs_prefix 1)" = "_iojs-v1" ] || die '"nvm_add_iojs_prefix 1" did not return "iojs-v1"'
+[ "_$(nvm_add_iojs_prefix iojs-1)" = "_iojs-v1" ] || die '"nvm_add_iojs_prefix iojs-1" did not return "iojs-v1"'
+[ "_$(nvm_add_iojs_prefix iojs-1.2.3)" = "_iojs-v1.2.3" ] || die '"nvm_add_iojs_prefix iojs-1.2.3" did not return "iojs-v1.2.3"'
--- a/tests/nvm_alias
+++ b/tests/nvm_alias
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup () {
+  rm -rf ../../../alias/test
+}
+
+. ../../../nvm.sh
+
+OUTPUT="$(nvm_alias 2>&1)"
+EXPECTED_OUTPUT='An alias is required.'
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_alias' produced wrong output; got $OUTPUT"
+
+EXIT_CODE="$(nvm_alias >/dev/null 2>&1 ; echo $?)"
+[ "_$EXIT_CODE" = "_1" ] || die "'nvm_alias' exited with $EXIT_CODE, expected 1"
+
+rm -rf ../../../alias/nonexistent
+
+OUTPUT="$(nvm_alias nonexistent 2>&1)"
+EXPECTED_OUTPUT='Alias does not exist.'
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_alias nonexistent' produced wrong output; got $OUTPUT"
+
+EXIT_CODE="$(nvm_alias nonexistent >/dev/null 2>&1 ; echo $?)"
+[ "_$EXIT_CODE" = "_2" ] || die "'nvm_alias nonexistent' exited with $EXIT_CODE, expected 2"
+
+EXPECTED_OUTPUT="0.10"
+nvm alias test "$EXPECTED_OUTPUT" || die "'nvm alias test $EXPECTED_OUTPUT' failed"
+OUTPUT="$(nvm_alias test)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_alias test' produced wrong output; got $OUTPUT"
+
+cleanup
+
--- a/tests/nvm_alias_path
+++ b/tests/nvm_alias_path
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "_$(nvm_alias_path)" = "_$NVM_DIR/alias" ] || die "nvm_alias_path did not requrn correct location"
+
--- a/tests/nvm_ensure_default_set
+++ b/tests/nvm_ensure_default_set
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXPECTED_OUTPUT="nvm_ensure_default_set: a version is required"
+OUTPUT="$(nvm_ensure_default_set 2>&1 >/dev/null)"
+EXIT_CODE="$?"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set' did not output "$EXPECTED_OUTPUT", got "$OUTPUT""
+[ "_$EXIT_CODE" = "_1" ] || die "'nvm_ensure_default_set' did not exit with 1, got "$EXIT_CODE""
+
+# see test/fast/Aliases for remaining nvm_ensure_default_set tests
--- a/tests/nvm_ensure_version_installed
+++ b/tests/nvm_ensure_version_installed
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+cleanup () {
+  rm -rf "$(nvm_version_path v0.1.2)"
+}
+
+. ../../../nvm.sh
+
+mkdir -p "$(nvm_version_path v0.1.2)"
+
+OUTPUT="$(nvm_ensure_version_installed foo 2>&1)"
+EXIT_CODE=$?
+EXPECTED_OUTPUT='N/A: version "foo" is not yet installed'
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "expected 'nvm_ensure_version_installed foo' to give $EXPECTED_OUTPUT, got $OUTPUT"
+[ "_$EXIT_CODE" = "_1" ] || die "expected 'nvm_ensure_version_installed foo' to exit with 1, got $EXIT_CODE"
+
+OUTPUT="$(nvm_ensure_version_installed 0.1)"
+EXIT_CODE=$?
+[ "_$OUTPUT" = "_" ] || die "expected 'nvm_ensure_version_installed 0.1' to have no output, got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "expected 'nvm_ensure_version_installed 0.1' to exit with 0, got $EXIT_CODE"
+
+cleanup
--- a/tests/nvm_ensure_version_prefix
+++ b/tests/nvm_ensure_version_prefix
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "_$(nvm_ensure_version_prefix 1)" = "_v1" ] || die '"nvm_ensure_version_prefix 1" did not return "v1"'
+[ "_$(nvm_ensure_version_prefix v1)" = "_v1" ] || die '"nvm_ensure_version_prefix v1" did not return "v1"'
+[ "_$(nvm_ensure_version_prefix foo)" = "_foo" ] || die '"nvm_ensure_version_prefix foo" did not return "foo"'
+
+[ "_$(nvm_ensure_version_prefix iojs-1)" = "_iojs-v1" ] || die '"nvm_ensure_version_prefix iojs-1" did not return "iojs-v1"'
+[ "_$(nvm_ensure_version_prefix iojs-v1)" = "_iojs-v1" ] || die '"nvm_ensure_version_prefix iojs-v1" did not return "iojs-v1"'
--- a/tests/nvm_find_up
+++ b/tests/nvm_find_up
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+setup() {
+  cleanup
+  mkdir -p tmp_nvm_find_up/a/b/c/d
+  touch tmp_nvm_find_up/test
+  touch tmp_nvm_find_up/a/b/c/test
+}
+cleanup () {
+  rm -rf tmp_nvm_find_up
+}
+
+. ../../../nvm.sh
+
+setup
+
+TEST_DIR="$PWD"
+
+[ "~$(PWD=$TEST_DIR/tmp_nvm_find_up/a nvm_find_up 'test')" = "~$TEST_DIR/tmp_nvm_find_up" ] || die "failed to find 1 dir up"
+[ "~$(PWD=$TEST_DIR/tmp_nvm_find_up/a/b nvm_find_up 'test')" = "~$TEST_DIR/tmp_nvm_find_up" ] || die "failed to find 2 dirs up"
+[ "~$(PWD=$TEST_DIR/tmp_nvm_find_up/a/b/c nvm_find_up 'test')" = "~$TEST_DIR/tmp_nvm_find_up/a/b/c" ] || die "failed to find in current dir"
+[ "~$(PWD=$TEST_DIR/tmp_nvm_find_up/a/b/c/d nvm_find_up 'test')" = "~$TEST_DIR/tmp_nvm_find_up/a/b/c" ] || die "failed to find 1 level up from current dir"
+
+cleanup
+
--- a/tests/nvm_format_version
+++ b/tests/nvm_format_version
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+OUTPUT="$(nvm_format_version 0.1.2)"
+EXPECTED_OUTPUT="v0.1.2"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_format_version 0.1.2 did not return $EXPECTED_OUTPUT; got $OUTPUT"
+
+OUTPUT="$(nvm_format_version 0.1)"
+EXPECTED_OUTPUT="v0.1.0"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_format_version 0.1.0 did not return $EXPECTED_OUTPUT; got $OUTPUT"
+
--- a/tests/nvm_get_latest
+++ b/tests/nvm_get_latest
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  unset -f nvm_has
+}
+
+. ../../../nvm.sh
+
+nvm_has() { return 1 ; }
+
+OUTPUT="$(nvm_get_latest 2>&1)"
+EXIT_CODE="$(nvm_get_latest >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_nvm needs curl or wget to proceed." ] \
+  || die "no curl/wget did not report correct error message, got '$OUTPUT'"
+[ "_$EXIT_CODE" = "_1" ] \
+  || die "no curl/wget did not exit with code 1, got $EXIT_CODE"
+
+cleanup
--- a/test/fast/Unit
+++ b/test/fast/Unit
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm_has cat && type cat > /dev/null || die 'nvm_has locates "cat" properly'
+
+[ "~$(nvm_has foobarbaz 2>&1)" = "~" ] || die "nvm_has does not suppress error output"
+
+! nvm_has foobarbaz && ! type foobarbaz >/dev/null 2>&1 || die "nvm_has does not return a nonzero exit code when not found"
+
--- a/tests/nvm_has_system_iojs
+++ b/tests/nvm_has_system_iojs
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+cleanup () {
+  rm ../../../versions/io.js/v0.1.2/node
+  rm ../../../versions/io.js/v0.1.2/iojs
+  rmdir ../../../versions/io.js/v0.1.2
+}
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+mkdir ../../../versions/io.js/v0.1.2
+touch ../../../versions/io.js/v0.1.2/node
+touch ../../../versions/io.js/v0.1.2/iojs
+
+nvm use iojs-v0.1.2
+
+if command -v iojs; then
+  nvm_has_system_iojs
+else
+  ! nvm_has_system_iojs
+fi
+
+nvm deactivate /dev/null 2>&1
+
+if command -v iojs; then
+  nvm_has_system_iojs
+else
+  ! nvm_has_system_iojs
+fi
+
--- a/tests/nvm_iojs_prefix
+++ b/tests/nvm_iojs_prefix
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "$(nvm_iojs_prefix)" = "iojs" ] || die '"nvm_iojs_prefix" did not return the string "iojs". why did this fail?!'
--- a/tests/nvm_is_alias
+++ b/tests/nvm_is_alias
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+cleanup () { unalias foo; unalias grep; }
+die () { echo $@ ; cleanup ; exit 1; }
+
+. ../../../nvm.sh
+
+alias foo='bar'
+nvm_is_alias foo || die '"nvm_is_alias foo" was not true'
+
+! nvm_is_alias nvm_is_alias || die '"nvm_is_alias nvm_is_alias was not false'
+
+alias grep='grep'
+unalias grep || die '"unalias grep" failed'
+! nvm_is_alias grep || die '"nvm_is_alias grep" with unaliased grep was not false'
+
+alias grep='grep'
+nvm_is_alias grep || die '"nvm_is_alias grep" with aliased grep was not true'
+
+cleanup
--- a/tests/nvm_is_iojs_version
+++ b/tests/nvm_is_iojs_version
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm_is_iojs_version 'iojs-' || die '"nvm_is_iojs_version iojs- was not true'
+nvm_is_iojs_version 'iojs-foo' || die '"nvm_is_iojs_version iojs- was not true'
+! nvm_is_iojs_version 'iojs' || die '"nvm_is_iojs_version iojs was not false'
+! nvm_is_iojs_version 'v1.0.0' || die '"nvm_is_iojs_version v1.0.0" was not false'
--- a/tests/nvm_is_valid_version
+++ b/tests/nvm_is_valid_version
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm_is_valid_version 0.1.2 || die "nvm_is_valid_version 0.1.2 did not return 0"
+nvm_is_valid_version foo && die "nvm_is_valid_version foo did not return 1"
+nvm_is_valid_version iojs-1 || die "nvm_is_valid_version iojs-1 did not return 0"
+nvm_is_valid_version iojs || die "nvm_is_valid_version iojs did not return 0"
+nvm_is_valid_version node || die "nvm_is_valid_version node did not return 0"
+nvm_is_valid_version stable || die "nvm_is_valid_version stable did not return 0"
+nvm_is_valid_version unstable || die "nvm_is_valid_version unstable did not return 0"
--- a/tests/nvm_ls_current
+++ b/tests/nvm_ls_current
@@ -1,19 +1,26 @@
 #!/bin/sh

-die () { echo $@ ; exit 1; }
+TEST_PWD=$(pwd)
+TEST_DIR="$TEST_PWD/nvm_ls_current_tmp"
+
+cleanup() { rm -rf "$TEST_DIR"; unset -f return_zero; alias node='node' ; unalias node; }
+die () { echo $@ ; cleanup ; exit 1; }

 . ../../../nvm.sh

 return_zero () { return 0; }

-[ "$( (nvm deactivate > /dev/null 2>&1) && nvm_ls_current)" = "system" ] || die 'when deactivated, did not return "system"'
+if nvm_has_system_node || nvm_has_system_iojs; then
+  EXPECTED_SYSTEM_NODE="system"
+else
+  EXPECTED_SYSTEM_NODE="none"
+fi
+[ "_$(nvm deactivate > /dev/null 2>&1 ; nvm_ls_current)" = "_$EXPECTED_SYSTEM_NODE" ] || die "when deactivated, did not return $EXPECTED_SYSTEM_NODE"

-TEST_PWD=$(pwd)
-TEST_DIR="$TEST_PWD/nvm_ls_current_tmp"
 rm -rf "$TEST_DIR"
 mkdir "$TEST_DIR"
-ln -s "$(which which)" "$TEST_DIR/which"
-ln -s "$(which dirname)" "$TEST_DIR/dirname"
+ln -s "$(command which which)" "$TEST_DIR/which"
+ln -s "$(command which dirname)" "$TEST_DIR/dirname"

 [ "$(PATH="$TEST_DIR" nvm_ls_current)" = "none" ] || die 'when node not installed, nvm_ls_current did not return "none"'
 [ "@$(PATH="$TEST_DIR" nvm_ls_current 2> /dev/stdout 1> /dev/null)@" = "@@" ] || die 'when node not installed, nvm_ls_current returned error output'
@@ -24,5 +31,7 @@ chmod a+x "$TEST_DIR/node"

 [ "$(alias nvm_tree_contains_path='return_zero' && PATH="$TEST_DIR" nvm_ls_current)" = "VERSION FOO!" ] || die 'when activated, did not return nvm node version'

-rm -rf "$TEST_DIR"
+alias node='node --harmony'
+[ "$(alias nvm_tree_contains_path='return_zero' && PATH="$TEST_DIR" nvm_ls_current)" = "VERSION FOO!" ] || die 'when activated and node aliased, did not return nvm node version'

+cleanup
--- a/tests/nvm_ls_remote
+++ b/tests/nvm_ls_remote
@@ -0,0 +1,485 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  unset -f nvm_download
+}
+
+. ../../../nvm.sh
+
+# sample output at the time the test was written
+nvm_download() {
+  echo 'foo "v0.10.0'
+  echo 'foo "v0.10.0'
+  echo 'foo "v0.10.1'
+  echo 'foo "v0.10.1'
+  echo 'foo "v0.10.10'
+  echo 'foo "v0.10.10'
+  echo 'foo "v0.10.11'
+  echo 'foo "v0.10.11'
+  echo 'foo "v0.10.12'
+  echo 'foo "v0.10.12'
+  echo 'foo "v0.10.13'
+  echo 'foo "v0.10.13'
+  echo 'foo "v0.10.14'
+  echo 'foo "v0.10.14'
+  echo 'foo "v0.10.15'
+  echo 'foo "v0.10.15'
+  echo 'foo "v0.10.16'
+  echo 'foo "v0.10.16'
+  echo 'foo "v0.10.16'
+  echo 'foo "v0.10.16'
+  echo 'foo "v0.10.17'
+  echo 'foo "v0.10.17'
+  echo 'foo "v0.10.18'
+  echo 'foo "v0.10.18'
+  echo 'foo "v0.10.19'
+  echo 'foo "v0.10.19'
+  echo 'foo "v0.10.2'
+  echo 'foo "v0.10.2'
+  echo 'foo "v0.10.20'
+  echo 'foo "v0.10.20'
+  echo 'foo "v0.10.21'
+  echo 'foo "v0.10.21'
+  echo 'foo "v0.10.22'
+  echo 'foo "v0.10.22'
+  echo 'foo "v0.10.23'
+  echo 'foo "v0.10.23'
+  echo 'foo "v0.10.24'
+  echo 'foo "v0.10.24'
+  echo 'foo "v0.10.25'
+  echo 'foo "v0.10.25'
+  echo 'foo "v0.10.26'
+  echo 'foo "v0.10.26'
+  echo 'foo "v0.10.27'
+  echo 'foo "v0.10.27'
+  echo 'foo "v0.10.28'
+  echo 'foo "v0.10.28'
+  echo 'foo "v0.10.29'
+  echo 'foo "v0.10.29'
+  echo 'foo "v0.10.3'
+  echo 'foo "v0.10.3'
+  echo 'foo "v0.10.30'
+  echo 'foo "v0.10.30'
+  echo 'foo "v0.10.31'
+  echo 'foo "v0.10.31'
+  echo 'foo "v0.10.32'
+  echo 'foo "v0.10.32'
+  echo 'foo "v0.10.4'
+  echo 'foo "v0.10.4'
+  echo 'foo "v0.10.5'
+  echo 'foo "v0.10.5'
+  echo 'foo "v0.10.6'
+  echo 'foo "v0.10.6'
+  echo 'foo "v0.10.7'
+  echo 'foo "v0.10.7'
+  echo 'foo "v0.10.8'
+  echo 'foo "v0.10.8'
+  echo 'foo "v0.10.9'
+  echo 'foo "v0.10.9'
+  echo 'foo "v0.11.0'
+  echo 'foo "v0.11.0'
+  echo 'foo "v0.11.1'
+  echo 'foo "v0.11.1'
+  echo 'foo "v0.11.10'
+  echo 'foo "v0.11.10'
+  echo 'foo "v0.11.11'
+  echo 'foo "v0.11.11'
+  echo 'foo "v0.11.12'
+  echo 'foo "v0.11.12'
+  echo 'foo "v0.11.13'
+  echo 'foo "v0.11.13'
+  echo 'foo "v0.11.14'
+  echo 'foo "v0.11.14'
+  echo 'foo "v0.11.2'
+  echo 'foo "v0.11.2'
+  echo 'foo "v0.11.3'
+  echo 'foo "v0.11.3'
+  echo 'foo "v0.11.4'
+  echo 'foo "v0.11.4'
+  echo 'foo "v0.11.5'
+  echo 'foo "v0.11.5'
+  echo 'foo "v0.11.6'
+  echo 'foo "v0.11.6'
+  echo 'foo "v0.11.7'
+  echo 'foo "v0.11.7'
+  echo 'foo "v0.11.8'
+  echo 'foo "v0.11.8'
+  echo 'foo "v0.11.9'
+  echo 'foo "v0.11.9'
+  echo 'foo "v0.5.1'
+  echo 'foo "v0.5.1'
+  echo 'foo "v0.5.10'
+  echo 'foo "v0.5.10'
+  echo 'foo "v0.5.2'
+  echo 'foo "v0.5.2'
+  echo 'foo "v0.5.3'
+  echo 'foo "v0.5.3'
+  echo 'foo "v0.5.4'
+  echo 'foo "v0.5.4'
+  echo 'foo "v0.5.5'
+  echo 'foo "v0.5.5'
+  echo 'foo "v0.5.6'
+  echo 'foo "v0.5.6'
+  echo 'foo "v0.5.7'
+  echo 'foo "v0.5.7'
+  echo 'foo "v0.5.8'
+  echo 'foo "v0.5.8'
+  echo 'foo "v0.5.9'
+  echo 'foo "v0.5.9'
+  echo 'foo "v0.6.0'
+  echo 'foo "v0.6.0'
+  echo 'foo "v0.6.1'
+  echo 'foo "v0.6.1'
+  echo 'foo "v0.6.10'
+  echo 'foo "v0.6.10'
+  echo 'foo "v0.6.11'
+  echo 'foo "v0.6.11'
+  echo 'foo "v0.6.12'
+  echo 'foo "v0.6.12'
+  echo 'foo "v0.6.13'
+  echo 'foo "v0.6.13'
+  echo 'foo "v0.6.14'
+  echo 'foo "v0.6.14'
+  echo 'foo "v0.6.15'
+  echo 'foo "v0.6.15'
+  echo 'foo "v0.6.16'
+  echo 'foo "v0.6.16'
+  echo 'foo "v0.6.17'
+  echo 'foo "v0.6.17'
+  echo 'foo "v0.6.18'
+  echo 'foo "v0.6.18'
+  echo 'foo "v0.6.19'
+  echo 'foo "v0.6.19'
+  echo 'foo "v0.6.2'
+  echo 'foo "v0.6.2'
+  echo 'foo "v0.6.20'
+  echo 'foo "v0.6.20'
+  echo 'foo "v0.6.21'
+  echo 'foo "v0.6.21'
+  echo 'foo "v0.6.3'
+  echo 'foo "v0.6.3'
+  echo 'foo "v0.6.4'
+  echo 'foo "v0.6.4'
+  echo 'foo "v0.6.5'
+  echo 'foo "v0.6.5'
+  echo 'foo "v0.6.6'
+  echo 'foo "v0.6.6'
+  echo 'foo "v0.6.7'
+  echo 'foo "v0.6.7'
+  echo 'foo "v0.6.8'
+  echo 'foo "v0.6.8'
+  echo 'foo "v0.6.9'
+  echo 'foo "v0.6.9'
+  echo 'foo "v0.7.0'
+  echo 'foo "v0.7.0'
+  echo 'foo "v0.7.1'
+  echo 'foo "v0.7.1'
+  echo 'foo "v0.7.10'
+  echo 'foo "v0.7.10'
+  echo 'foo "v0.7.11'
+  echo 'foo "v0.7.11'
+  echo 'foo "v0.7.12'
+  echo 'foo "v0.7.12'
+  echo 'foo "v0.7.2'
+  echo 'foo "v0.7.2'
+  echo 'foo "v0.7.3'
+  echo 'foo "v0.7.3'
+  echo 'foo "v0.7.4'
+  echo 'foo "v0.7.4'
+  echo 'foo "v0.7.5'
+  echo 'foo "v0.7.5'
+  echo 'foo "v0.7.6'
+  echo 'foo "v0.7.6'
+  echo 'foo "v0.7.7'
+  echo 'foo "v0.7.7'
+  echo 'foo "v0.7.8'
+  echo 'foo "v0.7.8'
+  echo 'foo "v0.7.9'
+  echo 'foo "v0.7.9'
+  echo 'foo "v0.8.0'
+  echo 'foo "v0.8.0'
+  echo 'foo "v0.8.1'
+  echo 'foo "v0.8.1'
+  echo 'foo "v0.8.10'
+  echo 'foo "v0.8.10'
+  echo 'foo "v0.8.11'
+  echo 'foo "v0.8.11'
+  echo 'foo "v0.8.12'
+  echo 'foo "v0.8.12'
+  echo 'foo "v0.8.13'
+  echo 'foo "v0.8.13'
+  echo 'foo "v0.8.14'
+  echo 'foo "v0.8.14'
+  echo 'foo "v0.8.15'
+  echo 'foo "v0.8.15'
+  echo 'foo "v0.8.16'
+  echo 'foo "v0.8.16'
+  echo 'foo "v0.8.17'
+  echo 'foo "v0.8.17'
+  echo 'foo "v0.8.18'
+  echo 'foo "v0.8.18'
+  echo 'foo "v0.8.19'
+  echo 'foo "v0.8.19'
+  echo 'foo "v0.8.2'
+  echo 'foo "v0.8.2'
+  echo 'foo "v0.8.20'
+  echo 'foo "v0.8.20'
+  echo 'foo "v0.8.21'
+  echo 'foo "v0.8.21'
+  echo 'foo "v0.8.22'
+  echo 'foo "v0.8.22'
+  echo 'foo "v0.8.23'
+  echo 'foo "v0.8.23'
+  echo 'foo "v0.8.24'
+  echo 'foo "v0.8.24'
+  echo 'foo "v0.8.25'
+  echo 'foo "v0.8.25'
+  echo 'foo "v0.8.26'
+  echo 'foo "v0.8.26'
+  echo 'foo "v0.8.27'
+  echo 'foo "v0.8.27'
+  echo 'foo "v0.8.28'
+  echo 'foo "v0.8.28'
+  echo 'foo "v0.8.3'
+  echo 'foo "v0.8.3'
+  echo 'foo "v0.8.4'
+  echo 'foo "v0.8.4'
+  echo 'foo "v0.8.5'
+  echo 'foo "v0.8.5'
+  echo 'foo "v0.8.6'
+  echo 'foo "v0.8.6'
+  echo 'foo "v0.8.7'
+  echo 'foo "v0.8.7'
+  echo 'foo "v0.8.8'
+  echo 'foo "v0.8.8'
+  echo 'foo "v0.8.9'
+  echo 'foo "v0.8.9'
+  echo 'foo "v0.9.0'
+  echo 'foo "v0.9.0'
+  echo 'foo "v0.9.1'
+  echo 'foo "v0.9.1'
+  echo 'foo "v0.9.10'
+  echo 'foo "v0.9.10'
+  echo 'foo "v0.9.11'
+  echo 'foo "v0.9.11'
+  echo 'foo "v0.9.12'
+  echo 'foo "v0.9.12'
+  echo 'foo "v0.9.2'
+  echo 'foo "v0.9.2'
+  echo 'foo "v0.9.3'
+  echo 'foo "v0.9.3'
+  echo 'foo "v0.9.4'
+  echo 'foo "v0.9.4'
+  echo 'foo "v0.9.5'
+  echo 'foo "v0.9.5'
+  echo 'foo "v0.9.6'
+  echo 'foo "v0.9.6'
+  echo 'foo "v0.9.7'
+  echo 'foo "v0.9.7'
+  echo 'foo "v0.9.8'
+  echo 'foo "v0.9.8'
+  echo 'foo "v0.9.9'
+  echo 'foo "v0.9.9'
+  echo 'foo "v0.1.100'
+  echo 'foo "v0.1.100'
+  echo 'foo "v0.1.101'
+  echo 'foo "v0.1.101'
+  echo 'foo "v0.1.102'
+  echo 'foo "v0.1.102'
+  echo 'foo "v0.1.103'
+  echo 'foo "v0.1.103'
+  echo 'foo "v0.1.104'
+  echo 'foo "v0.1.104'
+  echo 'foo "v0.1.14'
+  echo 'foo "v0.1.14'
+  echo 'foo "v0.1.15'
+  echo 'foo "v0.1.15'
+  echo 'foo "v0.1.16'
+  echo 'foo "v0.1.16'
+  echo 'foo "v0.1.17'
+  echo 'foo "v0.1.17'
+  echo 'foo "v0.1.18'
+  echo 'foo "v0.1.18'
+  echo 'foo "v0.1.19'
+  echo 'foo "v0.1.19'
+  echo 'foo "v0.1.20'
+  echo 'foo "v0.1.20'
+  echo 'foo "v0.1.21'
+  echo 'foo "v0.1.21'
+  echo 'foo "v0.1.22'
+  echo 'foo "v0.1.22'
+  echo 'foo "v0.1.23'
+  echo 'foo "v0.1.23'
+  echo 'foo "v0.1.24'
+  echo 'foo "v0.1.24'
+  echo 'foo "v0.1.25'
+  echo 'foo "v0.1.25'
+  echo 'foo "v0.1.26'
+  echo 'foo "v0.1.26'
+  echo 'foo "v0.1.27'
+  echo 'foo "v0.1.27'
+  echo 'foo "v0.1.28'
+  echo 'foo "v0.1.28'
+  echo 'foo "v0.1.29'
+  echo 'foo "v0.1.29'
+  echo 'foo "v0.1.30'
+  echo 'foo "v0.1.30'
+  echo 'foo "v0.1.31'
+  echo 'foo "v0.1.31'
+  echo 'foo "v0.1.32'
+  echo 'foo "v0.1.32'
+  echo 'foo "v0.1.33'
+  echo 'foo "v0.1.33'
+  echo 'foo "v0.1.90'
+  echo 'foo "v0.1.90'
+  echo 'foo "v0.1.91'
+  echo 'foo "v0.1.91'
+  echo 'foo "v0.1.92'
+  echo 'foo "v0.1.92'
+  echo 'foo "v0.1.93'
+  echo 'foo "v0.1.93'
+  echo 'foo "v0.1.94'
+  echo 'foo "v0.1.94'
+  echo 'foo "v0.1.95'
+  echo 'foo "v0.1.95'
+  echo 'foo "v0.1.96'
+  echo 'foo "v0.1.96'
+  echo 'foo "v0.1.97'
+  echo 'foo "v0.1.97'
+  echo 'foo "v0.1.98'
+  echo 'foo "v0.1.98'
+  echo 'foo "v0.1.99'
+  echo 'foo "v0.1.99'
+  echo 'foo "v0.10.14'
+  echo 'foo "v0.10.14'
+  echo 'foo "v0.2.0'
+  echo 'foo "v0.2.0'
+  echo 'foo "v0.2.1'
+  echo 'foo "v0.2.1'
+  echo 'foo "v0.2.2'
+  echo 'foo "v0.2.2'
+  echo 'foo "v0.2.3'
+  echo 'foo "v0.2.3'
+  echo 'foo "v0.2.4'
+  echo 'foo "v0.2.4'
+  echo 'foo "v0.2.5'
+  echo 'foo "v0.2.5'
+  echo 'foo "v0.2.6'
+  echo 'foo "v0.2.6'
+  echo 'foo "v0.3.0'
+  echo 'foo "v0.3.0'
+  echo 'foo "v0.3.1'
+  echo 'foo "v0.3.1'
+  echo 'foo "v0.3.2'
+  echo 'foo "v0.3.2'
+  echo 'foo "v0.3.3'
+  echo 'foo "v0.3.3'
+  echo 'foo "v0.3.4'
+  echo 'foo "v0.3.4'
+  echo 'foo "v0.3.5'
+  echo 'foo "v0.3.5'
+  echo 'foo "v0.3.6'
+  echo 'foo "v0.3.6'
+  echo 'foo "v0.3.7'
+  echo 'foo "v0.3.7'
+  echo 'foo "v0.3.8'
+  echo 'foo "v0.3.8'
+  echo 'foo "v0.4.0'
+  echo 'foo "v0.4.0'
+  echo 'foo "v0.4.1'
+  echo 'foo "v0.4.1'
+  echo 'foo "v0.4.10'
+  echo 'foo "v0.4.10'
+  echo 'foo "v0.4.11'
+  echo 'foo "v0.4.11'
+  echo 'foo "v0.4.12'
+  echo 'foo "v0.4.12'
+  echo 'foo "v0.4.2'
+  echo 'foo "v0.4.2'
+  echo 'foo "v0.4.3'
+  echo 'foo "v0.4.3'
+  echo 'foo "v0.4.4'
+  echo 'foo "v0.4.4'
+  echo 'foo "v0.4.5'
+  echo 'foo "v0.4.5'
+  echo 'foo "v0.4.6'
+  echo 'foo "v0.4.6'
+  echo 'foo "v0.4.7'
+  echo 'foo "v0.4.7'
+  echo 'foo "v0.4.8'
+  echo 'foo "v0.4.8'
+  echo 'foo "v0.4.9'
+  echo 'foo "v0.4.9'
+  echo 'foo "v0.5.0'
+  echo 'foo "v0.5.0'
+  echo 'foo "v0.6.1'
+  echo 'foo "v0.6.1'
+  echo 'foo "v0.6.10'
+  echo 'foo "v0.6.10'
+  echo 'foo "v0.6.11'
+  echo 'foo "v0.6.11'
+  echo 'foo "v0.6.12'
+  echo 'foo "v0.6.12'
+  echo 'foo "v0.6.13'
+  echo 'foo "v0.6.13'
+  echo 'foo "v0.6.2'
+  echo 'foo "v0.6.2'
+  echo 'foo "v0.6.3'
+  echo 'foo "v0.6.3'
+  echo 'foo "v0.6.4'
+  echo 'foo "v0.6.4'
+  echo 'foo "v0.6.5'
+  echo 'foo "v0.6.5'
+  echo 'foo "v0.6.6'
+  echo 'foo "v0.6.6'
+  echo 'foo "v0.6.7'
+  echo 'foo "v0.6.7'
+  echo 'foo "v0.6.8'
+  echo 'foo "v0.6.8'
+  echo 'foo "v0.6.9'
+  echo 'foo "v0.6.9'
+}
+
+OUTPUT="$(nvm_ls_remote foo)"
+EXIT_CODE="$(nvm_ls_remote foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_N/A" ] || die "nonexistent version did not report N/A"
+[ "_$EXIT_CODE" = "_3" ] || die "nonexistent version did not exit with code 3, got $EXIT_CODE"
+
+OUTPUT="$(nvm_ls_remote)"
+EXPECTED_OUTPUT="$(nvm_download | \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "bare nvm_ls_remote did not output expected sorted versions; got $(echo "$OUTPUT") expected $(echo "$EXPECTED_OUTPUT")"
+
+OUTPUT="$(nvm_ls_remote 0.3)"
+EXPECTED_OUTPUT="v0.3.0
+v0.3.1
+v0.3.2
+v0.3.3
+v0.3.4
+v0.3.5
+v0.3.6
+v0.3.7
+v0.3.8"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_ls_remote 0.3 did not output 0.3.x versions; got $OUTPUT"
+
+# Sanity checks
+OUTPUT="$(nvm_print_implicit_alias remote stable)"
+EXPECTED_OUTPUT="0.10"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_print_implicit_alias remote stable did not output $EXPECTED_OUTPUT; got $OUTPUT"
+
+OUTPUT="$(nvm_print_implicit_alias remote unstable)"
+EXPECTED_OUTPUT="0.11"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_print_implicit_alias remote unstable did not output $EXPECTED_OUTPUT; got $OUTPUT"
+
+OUTPUT="$(nvm_ls_remote stable)"
+EXPECTED_OUTPUT="v0.10.32"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_ls_remote stable did not output $EXPECTED_OUTPUT; got $OUTPUT"
+
+OUTPUT="$(nvm_ls_remote unstable)"
+EXPECTED_OUTPUT="v0.11.14"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_ls_remote unstable did not output $EXPECTED_OUTPUT; got $OUTPUT"
+
+cleanup
+
--- a/tests/nvm_ls_remote_iojs
+++ b/tests/nvm_ls_remote_iojs
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  unset -f nvm_download
+}
+
+. ../../../nvm.sh
+
+# sample output at the time the test was written
+nvm_download() {
+  echo 'version	date	files	npm	v8	uv	zlib	openssl	modules'
+  echo 'v1.0.1	2015-01-14	linux-armv7l,linux-x64,linux-x86,osx-x64-tar,win-x64-exe,win-x64-msi,win-x86-exe,win-x86-msi'
+  echo 'v1.0.0	2015-01-14	linux-armv7l,linux-x64,linux-x86,osx-x64-tar,win-x64-exe,win-x64-msi,win-x86-exe,win-x86-msi'
+}
+
+OUTPUT="$(nvm_ls_remote_iojs foo)"
+EXIT_CODE="$(nvm_ls_remote_iojs foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_N/A" ] || die "nonexistent version did not report N/A"
+[ "_$EXIT_CODE" = "_3" ] || die "nonexistent version did not exit with code 3, got $EXIT_CODE"
+
+OUTPUT="$(nvm_ls_remote_iojs)"
+EXPECTED_OUTPUT="$(nvm_download | \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n | sed -e 's/^/iojs-/')"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "bare nvm_ls_remote_iojs did not output expected sorted versions; got $(echo "$OUTPUT") expected $(echo "$EXPECTED_OUTPUT")"
+
+OUTPUT="$(nvm_ls_remote_iojs 1.0)"
+EXPECTED_OUTPUT="iojs-v1.0.0
+iojs-v1.0.1"
+
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_ls_remote_iojs 1.0 did not output 1.0.x versions; got $OUTPUT"
+
+cleanup
+
--- a/tests/nvm_node_prefix
+++ b/tests/nvm_node_prefix
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "$(nvm_node_prefix)" = "node" ] || die '"nvm_node_prefix" did not return the string "node". why did this fail?!'
--- a/tests/nvm_num_version_groups
+++ b/tests/nvm_num_version_groups
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "~$(nvm_num_version_groups)" = "~0" ] || die "no args should give 0"
+[ "~$(nvm_num_version_groups v)" = "~0" ] || die "just "v" should give 0"
+[ "~$(nvm_num_version_groups .)" = "~0" ] || die "just "." should give 0"
+[ "~$(nvm_num_version_groups a)" = "~1" ] || die "one letter should give 1"
+
+[ "~$(nvm_num_version_groups 1)" = "~1" ] || die "1 should give 1"
+[ "~$(nvm_num_version_groups 1.)" = "~1" ] || die "1. should give 1"
+[ "~$(nvm_num_version_groups v1)" = "~1" ] || die "v1 should give 1"
+[ "~$(nvm_num_version_groups v1.)" = "~1" ] || die "v1. should give 1"
+
+[ "~$(nvm_num_version_groups 1.2)" = "~2" ] || die "1.2 should give 2"
+[ "~$(nvm_num_version_groups 1.2.)" = "~2" ] || die "1.2. should give 2"
+[ "~$(nvm_num_version_groups v1.2)" = "~2" ] || die "v1.2 should give 2"
+[ "~$(nvm_num_version_groups v1.2.)" = "~2" ] || die "v1.2. should give 2"
+
+[ "~$(nvm_num_version_groups 1.2.3)" = "~3" ] || die "1.2.3 should give 3"
+[ "~$(nvm_num_version_groups v1.2.3)" = "~3" ] || die "v1.2.3 should give 3"
+[ "~$(nvm_num_version_groups v1.2.3.)" = "~3" ] || die "v1.2.3. should give 3"
+
--- a/tests/nvm_print_implicit_alias
+++ b/tests/nvm_print_implicit_alias
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXPECTED_FIRST_MSG="nvm_print_implicit_alias must be specified with local or remote as the first argument."
+[ "_$(nvm_print_implicit_alias 2>&1)" = "_$EXPECTED_FIRST_MSG" ] \
+  || die "nvm_print_implicit_alias did not require local|remote as first argument"
+[ "_$(nvm_print_implicit_alias foo 2>&1)" = "_$EXPECTED_FIRST_MSG" ] \
+  || die "nvm_print_implicit_alias did not require local|remote as first argument"
+
+FIRST_EXIT_CODE="$(nvm_print_implicit_alias > /dev/null 2>&1 ; echo $?)"
+[ "_$FIRST_EXIT_CODE" = "_1" ] \
+  || die "nvm_print_implicit_alias without local|remote had wrong exit code: expected 1, got $FIRST_EXIT_CODE"
+
+EXPECTED_SECOND_MSG="Only implicit aliases 'stable', 'unstable', 'iojs', and 'node' are supported."
+[ "_$(nvm_print_implicit_alias local 2>&1)" = "_$EXPECTED_SECOND_MSG" ] \
+  || die "nvm_print_implicit_alias did not require stable|unstable|iojs|node as second argument"
+[ "_$(nvm_print_implicit_alias local foo 2>&1)" = "_$EXPECTED_SECOND_MSG" ] \
+  || die "nvm_print_implicit_alias did not require stable|unstable|iojs|node as second argument"
+
+SECOND_EXIT_CODE="$(nvm_print_implicit_alias local > /dev/null 2>&1 ; echo $?)"
+[ "_$SECOND_EXIT_CODE" = "_2" ] \
+  || die "nvm_print_implicit_alias without stable|unstable|iojs|node had wrong exit code: expected 2, got $SECOND_EXIT_CODE"
+
--- a/tests/nvm_print_implicit_alias
+++ b/tests/nvm_print_implicit_alias
@@ -0,0 +1,69 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+cleanup() {
+  rm -rf ../../../v0.2.3
+  rm -rf ../../../v0.3.4
+  rm -rf ../../../v0.4.6
+  rm -rf ../../../v0.5.7
+  rm -rf ../../../v0.7.7
+  rm -rf ../../../versions/io.js/v0.98.0
+  unset -f nvm_ls_remote nvm_ls_remote_iojs
+}
+
+. ../../../nvm.sh
+
+mkdir ../../../v0.2.3
+mkdir ../../../v0.3.4
+mkdir ../../../v0.4.6
+mkdir ../../../v0.5.7
+mkdir ../../../v0.7.7
+mkdir -p ../../../versions/io.js/v0.98.0
+
+LATEST_STABLE="$(nvm_print_implicit_alias local stable)"
+[ "_$LATEST_STABLE" = "_0.4" ] || die "local stable is not latest even minor: expected 0.4, got $LATEST_STABLE"
+
+LATEST_NODE="$(nvm_print_implicit_alias local node)"
+[ "_$LATEST_NODE" = "_stable" ] || die "local node is not stable: expected stable, got $LATEST_NODE"
+
+LATEST_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
+[ "_$LATEST_UNSTABLE" = "_0.7" ] || die "local unstable is not latest odd minor: expected 0.7, got $LATEST_UNSTABLE"
+
+LATEST_IOJS="$(nvm_print_implicit_alias local iojs)"
+[ "_$LATEST_IOJS" = "_iojs-v0.98" ] || die "local iojs is not latest iojs: expected iojs-v0.98, got $LATEST_IOJS"
+
+nvm_ls_remote() {
+  echo "v0.4.3"
+  echo "v0.5.4"
+  echo "v0.6.6"
+  echo "v0.7.7"
+  echo "v0.9.7"
+  echo "v0.4.3"
+  echo "v0.5.4"
+  echo "v0.6.6"
+  echo "v0.7.7"
+  echo "v0.9.7"
+}
+
+nvm_ls_remote_iojs() {
+  echo "iojs-v0.1.0"
+  echo "iojs-v0.1.1"
+  echo "iojs-v0.7.8"
+  echo "iojs-v0.98.5"
+  echo "iojs-v0.99.0"
+}
+
+LATEST_STABLE="$(nvm_print_implicit_alias remote stable)"
+[ "_$LATEST_STABLE" = "_0.6" ] || die "remote stable is not latest even minor: expected 0.6, got $LATEST_STABLE"
+
+LATEST_NODE="$(nvm_print_implicit_alias remote node)"
+[ "_$LATEST_NODE" = "_stable" ] || die "remote node is not stable: expected stable, got $LATEST_NODE"
+
+LATEST_UNSTABLE="$(nvm_print_implicit_alias remote unstable)"
+[ "_$LATEST_UNSTABLE" = "_0.9" ] || die "remote unstable is not latest odd minor: expected 0.9, got $LATEST_UNSTABLE"
+
+LATEST_IOJS="$(nvm_print_implicit_alias remote iojs)"
+[ "_$LATEST_IOJS" = "_iojs-v0.99" ] || die "remote iojs is not latest: expected iojs-v0.99, got $LATEST_IOJS"
+
+cleanup
+
--- a/tests/nvm_print_npm_version
+++ b/tests/nvm_print_npm_version
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+cleanup () {
+  alias nvm_has='\nvm_has'
+  alias npm='\npm'
+  unset -f nvm_has npm
+}
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm_has() { return 1; }
+OUTPUT="$(nvm_print_npm_version)"
+[ -z "$OUTPUT" ] || die "nvm_print_npm_version did not return empty when nvm_has returns 1, got '$OUTPUT'"
+
+nvm_has() { return 0; }
+npm() {
+  if [ "_$@" = "_--version" ]; then
+    echo "1.2.3"
+  else
+    echo "error"
+  fi
+}
+OUTPUT="$(nvm_print_npm_version)"
+EXPECTED_OUTPUT=" (npm v1.2.3)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_print_npm_version did not provided '$EXPECTED_OUTPUT', got '$OUTPUT'"
+
+cleanup
--- a/tests/nvm_remote_version
+++ b/tests/nvm_remote_version
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  unset -f nvm_ls_remote nvm_ls_remote_iojs
+}
+
+. ../../../nvm.sh
+
+nvm_ls_remote() {
+  echo "N/A"
+}
+OUTPUT="$(nvm_remote_version foo)"
+EXIT_CODE="$(nvm_remote_version foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_N/A" ] || die "nonexistent version did not report N/A"
+[ "_$EXIT_CODE" = "_3" ] || die "nonexistent version did not exit with code 3, got $EXIT_CODE"
+
+nvm_ls_remote_iojs() {
+  echo "N/A"
+}
+OUTPUT="$(nvm_remote_version iojs-foo)"
+EXIT_CODE="$(nvm_remote_version iojs-foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_N/A" ] || die "nonexistent version did not report N/A"
+[ "_$EXIT_CODE" = "_3" ] || die "nonexistent version did not exit with code 3, got $EXIT_CODE"
+
+
+nvm_ls_remote() {
+  if ! nvm_is_iojs_version "$1"; then
+    echo "test output"
+    echo "more test output"
+    echo "pattern received: _$1_"
+  fi
+}
+nvm_ls_remote_iojs() {
+  if [ -z "$1" ] || nvm_is_iojs_version "$1"; then
+    echo "test iojs output"
+    echo "more iojs test output"
+    echo "iojs pattern received: _$1_"
+  fi
+}
+OUTPUT="$(nvm_remote_version foo)"
+EXIT_CODE="$(nvm_remote_version foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_pattern received: _foo_" ] \
+  || die "nvm_remote_version foo did not return last line only of nvm_ls_remote foo; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version foo did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_version iojs-foo)"
+EXIT_CODE="$(nvm_remote_version iojs-foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_iojs pattern received: _iojs-foo_" ] \
+  || die "nvm_remote_version iojs-foo did not return last line only of nvm_ls_remote_iojs foo; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version iojs-foo did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_version iojs)"
+EXIT_CODE="$(nvm_remote_version iojs >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_iojs pattern received: __" ] \
+  || die "nvm_remote_version iojs did not return last line only of nvm_ls_remote_iojs; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version iojs did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_version stable)"
+EXIT_CODE="$(nvm_remote_version stable >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote stable)" ] \
+  || die "nvm_remote_version stable did not return contents of nvm_ls_remote stable; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version stable did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_version unstable)"
+EXIT_CODE="$(nvm_remote_version unstable >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote unstable)" ] \
+  || die "nvm_remote_version unstable did not return contents of nvm_ls_remote unstable; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version unstable did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_version node)"
+EXIT_CODE="$(nvm_remote_version node >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote node)" ] \
+  || die "nvm_remote_version node did not return contents of nvm_ls_remote node; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_version node did not exit with 0, got $EXIT_CODE"
+
+cleanup
--- a/tests/nvm_remote_versions
+++ b/tests/nvm_remote_versions
@@ -0,0 +1,78 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  unset -f nvm_ls_remote nvm_ls_remote_iojs
+}
+
+. ../../../nvm.sh
+
+OUTPUT="$(nvm_remote_versions stable 2>&1)"
+EXPECTED_OUTPUT="Implicit aliases are not supported in nvm_remote_versions."
+EXIT_CODE="$(nvm_remote_versions stable >/dev/null 2>&1; echo $?)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "implicit alias 'stable' did not error out with correct message, got $OUTPUT"
+[ "_$EXIT_CODE" = "_1" ] || die "implicit alias 'stable' did not exit with code 1, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_versions unstable 2>&1)"
+EXPECTED_OUTPUT="Implicit aliases are not supported in nvm_remote_versions."
+EXIT_CODE="$(nvm_remote_versions unstable >/dev/null 2>&1; echo $?)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "implicit alias 'unstable' did not error out with correct message, got $OUTPUT"
+[ "_$EXIT_CODE" = "_1" ] || die "implicit alias 'unstable' did not exit with code 1, got $EXIT_CODE"
+
+nvm_ls_remote() {
+  echo "N/A"
+}
+OUTPUT="$(nvm_remote_versions foo)"
+EXIT_CODE="$(nvm_remote_versions foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_N/A" ] || die "nonexistent version did not report N/A"
+[ "_$EXIT_CODE" = "_3" ] || die "nonexistent version did not exit with code 3, got $EXIT_CODE"
+
+nvm_ls_remote_iojs() {
+  echo "N/A"
+}
+OUTPUT="$(nvm_remote_versions iojs-foo)"
+EXIT_CODE="$(nvm_remote_versions iojs-foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_N/A" ] || die "nonexistent version did not report N/A"
+[ "_$EXIT_CODE" = "_3" ] || die "nonexistent version did not exit with code 3, got $EXIT_CODE"
+
+
+nvm_ls_remote() {
+  echo "test output"
+  echo "more test output"
+  echo "pattern received: _$1_"
+}
+nvm_ls_remote_iojs() {
+  echo "test iojs output"
+  echo "more iojs test output"
+  echo "iojs pattern received: _$1_"
+}
+
+OUTPUT="$(nvm_remote_versions foo)"
+EXIT_CODE="$(nvm_remote_versions foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote foo)
+$(nvm_ls_remote_iojs foo)" ] \
+  || die "nvm_remote_versions foo did not return contents of nvm_ls_remote foo combined with nvm_ls_remote_iojs foo; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_versions foo did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_versions node)"
+EXIT_CODE="$(nvm_remote_versions node >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote)" ] \
+  || die "nvm_remote_versions node did not return contents of nvm_ls_remote; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_versions node did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_versions iojs-foo)"
+EXIT_CODE="$(nvm_remote_versions iojs-foo >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote iojs-foo)
+$(nvm_ls_remote_iojs iojs-foo)" ] \
+  || die "nvm_remote_versions iojs-foo did not return contents of nvm_ls_remote iojs-foo combined with nvm_ls_remote_iojs iojs-foo; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_versions iojs-foo did not exit with 0, got $EXIT_CODE"
+
+OUTPUT="$(nvm_remote_versions iojs)"
+EXIT_CODE="$(nvm_remote_versions iojs >/dev/null 2>&1 ; echo $?)"
+[ "_$OUTPUT" = "_$(nvm_ls_remote_iojs)" ] \
+  || die "nvm_remote_versions iojs did not return contents of nvm_ls_remote_iojs; got $OUTPUT"
+[ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_versions iojs did not exit with 0, got $EXIT_CODE"
+
+cleanup
+
--- a/tests/nvm_strip_iojs_prefix
+++ b/tests/nvm_strip_iojs_prefix
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "_$(nvm_strip_iojs_prefix iojs)" = "_" ] || die '"nvm_strip_iojs_prefix iojs" did not return an empty string'
+[ "_$(nvm_strip_iojs_prefix iojs-)" = "_" ] || die '"nvm_strip_iojs_prefix iojs-" did not return an empty string'
+[ "_$(nvm_strip_iojs_prefix iojs-foo)" = "_foo" ] || die '"nvm_strip_iojs_prefix iojs-foo" did not return "foo"'
+[ "_$(nvm_strip_iojs_prefix iojsfoo)" = "_iojsfoo" ] || die '"nvm_strip_iojs_prefix iojsfoo" did not return "iojsfoo"'
--- a/tests/nvm_strip_path
+++ b/tests/nvm_strip_path
@@ -4,7 +4,7 @@ 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
+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:$NVM_DIR/versions/node/v0.12.0/bin:$NVM_DIR/versions/io.js/v1.0.0/bin

 STRIPPED_PATH=`nvm_strip_path "$TEST_PATH" "/bin"`

--- a/tests/nvm_validate_implicit_alias
+++ b/tests/nvm_validate_implicit_alias
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXPECTED_MSG="Only implicit aliases 'stable', 'unstable', 'iojs', and 'node' are supported."
+[ "_$(nvm_validate_implicit_alias 2>&1)" = "_$EXPECTED_MSG" ] \
+  || die "nvm_validate_implicit_alias did not require stable|unstable|iojs|node"
+[ "_$(nvm_validate_implicit_alias foo 2>&1)" = "_$EXPECTED_MSG" ] \
+  || die "nvm_validate_implicit_alias did not require stable|unstable|iojs|node"
+
+EXIT_CODE="$(nvm_validate_implicit_alias >/dev/null 2>&1 ; echo $?)"
+[ "_$EXIT_CODE" = "_1" ] \
+  || die "nvm_validate_implicit_alias without stable|unstable|iojs|node had wrong exit code: expected 1, got $EXIT_CODE"
+
+nvm_validate_implicit_alias stable || die "nvm_validate_implicit_alias stable did not exit 0"
+nvm_validate_implicit_alias unstable || die "nvm_validate_implicit_alias unstable did not exit 0"
+nvm_validate_implicit_alias node || die "nvm_validate_implicit_alias node did not exit 0"
+nvm_validate_implicit_alias iojs || die "nvm_validate_implicit_alias iojs did not exit 0"
+
--- a/tests/nvm_version
+++ b/tests/nvm_version
@@ -0,0 +1,48 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+cleanup () {
+  unset -f nvm_ls_current nvm_ls
+}
+
+. ../../../nvm.sh
+
+nvm_ls_current() {
+  echo "CURRENT!"
+  return 7
+}
+
+OUTPUT="$(nvm_version current)"
+EXPECTED_OUTPUT="CURRENT!"
+EXIT_CODE="$(nvm_version current 2>&1 >/dev/null ; echo $?)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die '"nvm_version current" did not return nvm_ls_current output'
+[ "_$EXIT_CODE" = "_7" ] || die '"nvm_version current" did not return nvm_ls_current exit code'
+
+OUTPUT="$(nvm_version)"
+EXPECTED_OUTPUT="CURRENT!"
+EXIT_CODE="$(nvm_version 2>&1 >/dev/null ; echo $?)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die '"nvm_version" did not return nvm_ls_current output'
+[ "_$EXIT_CODE" = "_7" ] || die '"nvm_version" did not return nvm_ls_current exit code'
+
+nvm_ls() {
+  echo "line 1"
+  echo "line 2"
+  echo "pattern: $1"
+}
+[ "_$(nvm_version foo)" = "_pattern: foo" ] || die '"nvm_version foo" did not pass the pattern to "nvm_ls", or return the last line'
+[ "_$(nvm_version node)" = "_pattern: stable" ] || die '"nvm_version node" did not pass "stable" to "nvm_ls"'
+[ "_$(nvm_version node-)" = "_pattern: stable" ] || die '"nvm_version node-" did not pass "stable" to "nvm_ls"'
+
+nvm_ls() { echo "N/A"; }
+OUTPUT="$(nvm_version foo)"
+EXPECTED_OUTPUT="N/A"
+EXIT_CODE="$(nvm_version foo 2>&1 >/dev/null ; echo $?)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die '"nvm_version" did not return N/A when nvm_ls returns N/A'
+[ "_$EXIT_CODE" = "_3" ] || die '"nvm_version" returning N/A did not exit code with code 3'
+
+nvm_ls() { echo; }
+OUTPUT="$(nvm_version foo)"
+EXPECTED_OUTPUT="N/A"
+EXIT_CODE="$(nvm_version foo 2>&1 >/dev/null ; echo $?)"
+[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die '"nvm_version" did not return N/A when nvm_ls returns nothing'
+[ "_$EXIT_CODE" = "_3" ] || die '"nvm_version" returning N/A did not exit code with code 3'
--- a/tests/nvm_version_dir
+++ b/tests/nvm_version_dir
@@ -4,7 +4,8 @@ die () { echo $@ ; exit 1; }

 . ../../../nvm.sh

-[ "$(nvm_version_dir)" = "$NVM_DIR/versions" ] || die '"nvm_version_dir" did not return new dir path'
+[ "$(nvm_version_dir)" = "$NVM_DIR/versions/node" ] || die '"nvm_version_dir" did not return new dir path'
+[ "$(nvm_version_dir iojs)" = "$NVM_DIR/versions/io.js" ] || die '"nvm_version_dir iojs" did not return iojs dir path'
 [ "$(nvm_version_dir new)" = "$(nvm_version_dir)" ] || die '"nvm_version_dir new" did not return new dir path'
 [ "$(nvm_version_dir old)" = "$NVM_DIR" ] || die '"nvm_version_dir old" did not return old dir path'
 [ "$(nvm_version_dir foo 2>&1)" = "unknown version dir" ] || die '"nvm_version_dir foo" did not error out'
--- a/tests/nvm_version_path
+++ b/tests/nvm_version_path
@@ -7,5 +7,6 @@ die () { echo $@ ; exit 1; }
 [ "$(nvm_version_path foo)" = "$NVM_DIR/foo" ] || die '"nvm_version_path foo" did not return correct location'
 [ "$(nvm_version_path 2>&1)" = "version is required" ] || die '"nvm_version_path" did not error out'
 [ "$(nvm_version_path v0.11.0)" = "$NVM_DIR/v0.11.0" ] || die 'old version has the wrong path'
-[ "$(nvm_version_path v0.12.0)" = "$NVM_DIR/versions/v0.12.0" ] || die 'new version has the wrong path'
+[ "$(nvm_version_path v0.12.0)" = "$NVM_DIR/versions/node/v0.12.0" ] || die 'new version has the wrong path'
+[ "$(nvm_version_path iojs-v0.12.0)" = "$NVM_DIR/versions/io.js/v0.12.0" ] || die 'iojs version has the wrong path'

--- a/test/install_script/nvm_check_global_modules
+++ b/test/install_script/nvm_check_global_modules
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+cleanup () {
+  rm -rf "$npm_config_prefix/lib" >/dev/null 2>&1
+  unset npm_config_prefix
+
+  rm -f npm
+  PATH="$ORIGINAL_PATH"
+
+  unset -f setup cleanup die
+  unset message ORIGINAL_PATH
+}
+die () { echo $@ ; cleanup ; exit 1; }
+
+NVM_ENV=testing . ../../install.sh
+
+setup () {
+  ORIGINAL_PATH="$PATH"
+
+  npm_config_prefix="$(pwd)"
+  export npm_config_prefix
+  mkdir -p "$npm_config_prefix/lib"
+}
+
+
+setup
+
+npm install -g nop >/dev/null || die 'nvm_check_global_modules cannot be tested because `npm` cannot install the `nop` package'
+message=$(nvm_check_global_modules)
+[ ! -z "$message" ] || die "nvm_check_global_modules should have printed a notice when npm had global modules installed"
+
+npm uninstall -g nop >/dev/null
+message=$(nvm_check_global_modules)
+[ -z "$message" ] || die "nvm_check_global_modules should not have printed a notice when npm had no global modules installed"
+
+# Faking an installation of npm
+mkdir -p "$npm_config_prefix/lib/node_modules/npm"
+cat <<'JSON' >"$npm_config_prefix/lib/node_modules/npm/package.json"
+{ "name": "npm", "version": "0.0.1fake" }
+JSON
+
+message=$(nvm_check_global_modules)
+[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm had only itself installed as a global module"
+
+# Faking the absence of npm
+PATH=".:$PATH"
+touch npm
+chmod +x npm
+
+message=$(nvm_check_global_modules)
+[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm was unavailable"
+
+
+cleanup
--- a/test/install_script/nvm_detect_profile
+++ b/test/install_script/nvm_detect_profile
@@ -0,0 +1,67 @@
+#!/bin/sh
+
+cleanup () {
+  unset -f setup cleanup die
+  unset _PROFILE
+  rm -f .bashrc .bash_profile .zshrc .profile test_profile > /dev/null 2>&1
+}
+die () { echo $@ ; cleanup ; exit 1; }
+
+NVM_ENV=testing . ../../install.sh
+
+setup () {
+  touch .bashrc
+  touch .bash_profile
+  touch .zshrc
+  touch .profile
+  touch test_profile
+}
+
+#Let's hack $HOME
+HOME="."
+
+setup
+
+
+# $PROFILE points to a valid file, its path must be returned
+PROFILE="test_profile"
+_PROFILE=$(nvm_detect_profile)
+[ "_$_PROFILE" = "_$PROFILE" ] || die "nvm_detect_profile didn't pick \$PROFILE"
+
+# $PROFILE doesn't point to a valid file, its path must not be returned
+PROFILE="invalid_profile"
+_PROFILE=$(nvm_detect_profile)
+[ "_$_PROFILE" != "_$PROFILE" ] || die "nvm_detect_profile shouldn't pick \$PROFILE when it's not a valid file"
+
+
+# Below are tests for when $PROFILE is undefined
+rm test_profile
+unset PROFILE
+
+# It should favor .bashrc if file exists
+_PROFILE=$(nvm_detect_profile)
+[ "_$_PROFILE" = "_$HOME/.bashrc" ] || die "nvm_detect_profile should have selected .bashrc"
+
+rm .bashrc
+# Otherwise, it should favor .bash_profile if file exists
+_PROFILE=$(nvm_detect_profile)
+[ "_$_PROFILE" = "_$HOME/.bash_profile" ] || die "nvm_detect_profile should have selected .bash_profile"
+
+rm .bash_profile
+# Otherwise, it should favor .zshrc if file exists
+_PROFILE=$(nvm_detect_profile)
+[ "_$_PROFILE" = "_$HOME/.zshrc" ] || die "nvm_detect_profile should have selected .zshrc"
+
+rm .zshrc
+# Otherwise, it should favor .profile if file exists
+_PROFILE=$(nvm_detect_profile)
+[ "_$_PROFILE" = "_$HOME/.profile" ] || die "nvm_detect_profile should have selected .profile"
+
+rm .profile
+# It should be empty if none is found
+_PROFILE=$(nvm_detect_profile)
+[ -z "$_PROFILE" ] || die "nvm_detect_profile should have echo'ed an empty value"
+
+
+cleanup
+
--- a/test/install_script/nvm_do_install
+++ b/test/install_script/nvm_do_install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+NVM_ENV=testing . ../../install.sh
+
+#nvm_do_install is available
+type nvm_do_install > /dev/null 2>&1 || die 'nvm_do_install is not available'
+
--- a/test/install_script/nvm_reset
+++ b/test/install_script/nvm_reset
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+cleanup () {
+  unset -f safe_type die cleanup
+}
+die () { echo $@ ; cleanup ; exit 1; }
+
+NVM_ENV=testing . ../../install.sh
+
+safe_type() {
+  type "$1" > /dev/null 2>&1
+}
+
+# Check nvm_reset exists
+safe_type nvm_reset || die 'nvm_reset is not available'
+
+# Apply nvm_reset
+nvm_reset || die 'nvm_reset failed'
+
+# The names should be unset
+! safe_type nvm_do_install || die 'nvm_do_install is still available'
+! safe_type nvm_has || die 'nvm_has is still available'
+! safe_type nvm_download || die 'nvm_download is still available'
+! safe_type install_nvm_as_script || die 'install_nvm_as_script is still available'
+! safe_type install_nvm_from_git || die 'install_nvm_from_git is still available'
+! safe_type nvm_reset || die 'nvm_reset is still available'
+! safe_type nvm_detect_profile || die 'nvm_detect_profile is still available'
+
+cleanup
+
--- a/test/install_script/nvm_source
+++ b/test/install_script/nvm_source
@@ -0,0 +1,40 @@
+#!/bin/sh
+
+cleanup () {
+  unset -f die cleanup
+  unset NVM_SOURCE out
+}
+die () { echo $@ ; cleanup ; exit 1; }
+
+NVM_ENV=testing . ../../install.sh
+
+# nvm_source with no parameter returns the git endpoint
+echo $(nvm_source) | grep "nvm.git$" > /dev/null || die "nvm_source without arguments should return the location of the git repo" 
+
+# nvm_source with git parameter returns the location of the nvm repo
+echo $(nvm_source "git") | grep "nvm.git$" > /dev/null || die "nvm_source without arguments should return the location of the git repo" 
+
+# nvm_source with script parameter returns the location of nvm.sh
+echo $(nvm_source "script") | grep "nvm.sh$" > /dev/null || die "nvm_source \"script\" should return the location of nvm.sh"
+
+# nvm_source with script-nvm-exec parameter returns the location of nvm-exec
+echo $(nvm_source "script-nvm-exec") | grep "nvm-exec$" > /dev/null || die "nvm_source \"script-nvm-exec\" should return the location of nvm.sh"
+
+# nvm_source with any other parameter errors out and exits
+nvm_source "anything" 2> /dev/null && die "nvm_source with invalid parameter should exit"
+out=$(nvm_source "anything" 2>&1 >/dev/null) || : #Saving the process here
+[ -z "$out" ] && die "nvm_source with invalid parameter should error out"
+
+#nvm_source should always return NVM_SOURCE no matter the parameters
+NVM_SOURCE="my_location"
+out=$(nvm_source)
+[ "_$out" = "_my_location" ] || die "nvm_source without arguments should have returned \$NVM_SOURCE. Got \"$out\""
+out=$(nvm_source "git")
+[ "_$out" = "_my_location" ] || die "nvm_source git should have returned \$NVM_SOURCE. Got \"$out\""
+out=$(nvm_source "script")
+[ "_$out" = "_my_location" ] || die "nvm_source script should have returned \$NVM_SOURCE. Got \"$out\""
+out=$(nvm_source "anything")
+[ "_$out" = "_my_location" ] || die "nvm_source script should have returned \$NVM_SOURCE. Got \"$out\""
+
+cleanup
+
--- a/test/installation/io.js/install
+++ b/test/installation/io.js/install
@@ -0,0 +1,26 @@
+#!/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 ../../../versions/io.js/v1.0.0 ] && rm -R ../../../versions/io.js/v1.0.0
+[ -e ../../../versions/io.js/v1.0.1 ] && rm -R ../../../versions/io.js/v1.0.1
+
+# Install from binary
+nvm install iojs-v1.0.0
+nvm install iojs-v1.0.1
+
+nvm use iojs-v1.0.0
+
+node --version | grep v1.0.0 || die "precondition failed: iojs node doesn't start at v1.0.0"
+iojs --version | grep v1.0.0 || die "precondition failed: iojs binary doesn't start at v1.0.0"
+
+nvm install iojs-v1.0.1
+
+node --version | grep v1.0.1 || die "nvm install on already installed version doesn't use it (node binary)"
+iojs --version | grep v1.0.1 || die "nvm install on already installed version doesn't use it (iojs binary)"
+
--- a/test/installation/io.js/install
+++ b/test/installation/io.js/install
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_TEST_VERSION="v1.0.0"
+NVM_PREFIXED_TEST_VERSION="iojs-$NVM_TEST_VERSION"
+
+# Remove the stuff we're clobbering.
+[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+
+# Install from binary
+nvm install $NVM_PREFIXED_TEST_VERSION || die "install $NVM_PREFIXED_TEST_VERSION failed"
+
+# Check
+[ -d ../../../versions/io.js/$NVM_TEST_VERSION ]
+nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION || die "'nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
--- a/test/installation/io.js/install
+++ b/test/installation/io.js/install
@@ -0,0 +1,26 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+# Remove the stuff we're clobbering.
+[ -e ../../../versions/io.js/v1.0.0 ] && rm -R ../../../versions/io.js/v1.0.0
+[ -e ../../../versions/io.js/v1.0.1 ] && rm -R ../../../versions/io.js/v1.0.1
+
+# Install from binary
+nvm install iojs-v1.0.0 || die "'nvm install iojs-v1.0.0' failed"
+nvm i iojs-v1.0.1 || die "'nvm i iojs-v1.0.1' failed"
+
+# Check
+[ -d ../../../versions/io.js/v1.0.0 ] || die "iojs v1.0.0 didn't exist"
+[ -d ../../../versions/io.js/v1.0.1 ] || die "iojs v1.0.1 didn't exist"
+
+# Use the first one
+nvm use iojs-1.0.0 || die "'nvm use iojs-1.0.0' failed"
+
+# Use the latest one
+nvm use iojs-1 || die "'nvm use iojs-1' failed"
+[ "_$(node --version)" = "_v1.0.1" ] || die "'node --version' was not v1.0.1, got: $(node --version)"
+[ "_$(iojs --version)" = "_v1.0.1" ] || die "'iojs --version' was not v1.0.1, got: $(iojs --version)"
+
--- a/test/installation/io.js/install
+++ b/test/installation/io.js/install
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_TEST_VERSION=v1.0.0
+NVM_PREFIXED_TEST_VERSION="iojs-$NVM_TEST_VERSION"
+VERSION_PATH="../../../versions/io.js/$NVM_TEST_VERSION"
+
+# Remove the stuff we're clobbering.
+[ -e $VERSION_PATH ] && rm -R $VERSION_PATH
+
+# Install from binary
+echo "$NVM_PREFIXED_TEST_VERSION" > .nvmrc
+
+nvm install || die "'nvm install' failed"
+
+# Check
+[ -d $VERSION_PATH ] || die "./$VERSION_PATH did not exist"
+nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION \
+  || "'nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
+
--- a/test/installation/io.js/install
+++ b/test/installation/io.js/install
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+# Remove the stuff we're clobbering.
+[ -e ../../../versions/io.js/v1.0.0 ] && rm -R ../../../versions/io.js/v1.0.0
+[ -e ../../../versions/io.js/v1.0.1 ] && rm -R ../../../versions/io.js/v1.0.1
+
+# Install from binary
+nvm install iojs-v1.0.0
+
+# Check
+[ -d ../../../versions/io.js/v1.0.0 ] || die "nvm install iojs-v1.0.0 didn't install"
+
+node --version | grep v1.0.0 > /dev/null || die "nvm install didn't use iojs-v1.0.0"
+
+npm install -g is-nan@1.0.1 || die "npm install -g is-nan failed"
+npm list --global | grep is-nan > /dev/null || die "is-nan isn't installed"
+
+nvm ls iojs-1 | grep iojs-v1.0.0 > /dev/null || die "nvm ls iojs-1 didn't show iojs-v1.0.0"
+
+nvm install iojs-v1.0.1 --reinstall-packages-from=iojs-1.0.0 || die "nvm install iojs-v1.0.1 --reinstall-packages-from=iojs-1.0.0 failed"
+
+[ -d ../../../versions/io.js/v1.0.1 ] || die "nvm install iojs-v1.0.1 didn't install"
+
+nvm use iojs-1
+node --version | grep v1.0.1 > /dev/null || die "nvm use iojs-1 didn't use v1.0.1"
+
+npm list --global | grep is-nan > /dev/null || die "is-nan isn't installed"
+
--- a/test/installation/io.js/nvm
+++ b/test/installation/io.js/nvm
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_VERSION="v1"
+NVM_PREFIXED_TEST_VERSION="$(nvm ls-remote "$NVM_VERSION" | tail -n1 | sed 's/^[    ]*//;s/[        ]*$//')"
+NVM_TEST_VERSION="$(nvm_strip_iojs_prefix "$NVM_PREFIXED_TEST_VERSION")"
+
+# Remove the stuff we're clobbering.
+[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+
+# Install from binary
+nvm install "$NVM_VERSION" || die "nvm install $NVM_VERSION failed"
+
+# Check
+[ -d ../../../versions/io.js/$NVM_TEST_VERSION ]
+nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION || die "'nvm run $NVM_PREFIXED_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
--- a/test/installation/io.js/setup_dir
+++ b/test/installation/io.js/setup_dir
--- a/test/installation/io.js/teardown_dir
+++ b/test/installation/io.js/teardown_dir
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+nvm deactivate
+nvm uninstall iojs-v1.0.0
+
+if [ -f ".nvmrc" ]; then
+  rm .nvmrc
+fi
+
+if [ -f ".nvmrc.bak" ]; then
+  mv .nvmrc.bak .nvmrc
+fi
+
--- a/test/installation/node/install
+++ b/test/installation/node/install
--- a/test/installation/node/install
+++ b/test/installation/node/install
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_TEST_VERSION=v0.10.7
+
+# Remove the stuff we're clobbering.
+[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+
+# Install from binary
+nvm install $NVM_TEST_VERSION || die "install $NVM_TEST_VERSION failed"
+
+# Check
+[ -d ../../../$NVM_TEST_VERSION ]
+nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || die "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
--- a/test/installation/node/install
+++ b/test/installation/node/install
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_TEST_VERSION=v0.10.7
+
+# Remove the stuff we're clobbering.
+[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+
+# Install from source
+nvm install -s $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed"
+
+# Check
+[ -d ../../../$NVM_TEST_VERSION ]
+nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
--- a/test/installation/node/install
+++ b/test/installation/node/install
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_TEST_VERSION=v0.8.5
+
+# Remove the stuff we're clobbering.
+[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+
+# Install from source implicitly (v0.8.6 is when binaries started)
+nvm install $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed"
+
+# Check
+[ -d ../../../$NVM_TEST_VERSION ]
+nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
--- a/test/installation/node/install
+++ b/test/installation/node/install
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+# 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 || die "'nvm install 0.9.7' failed"
+nvm i 0.9.12 || die "'nvm i 0.9.12' failed"
+
+# Check
+[ -d ../../../v0.9.7 ] || die "v0.9.7 didn't exist"
+[ -d ../../../v0.9.12 ] || die "v0.9.12 didn't exist"
+
+# Use the first one
+nvm use 0.9.7 || die "'nvm use 0.9.7' failed"
+
+# Use the latest one
+nvm use 0.9 || die "'nvm use 0.9' failed"
+node --version | grep v0.9.12 || die "'node --version' was not v0.9.12, got: $(node --version)"
+
--- a/test/installation/node/install
+++ b/test/installation/node/install
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_TEST_VERSION=v0.10.7
+
+# Remove the stuff we're clobbering.
+[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+
+# Install from binary
+echo "$NVM_TEST_VERSION" > .nvmrc
+
+nvm install || die "'nvm install' failed"
+
+# Check
+[ -d ../../../$NVM_TEST_VERSION ] || die "./$NVM_TEST_VERSION did not exist"
+nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION \
+  || "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
+
--- a/test/installation/node/install
+++ b/test/installation/node/install
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+NVM_TEST_VERSION=v0.10.7
+
+# Remove the stuff we're clobbering.
+[ -e ../../../$NVM_TEST_VERSION ] && rm -R ../../../$NVM_TEST_VERSION
+
+# Install from binary
+echo "$NVM_TEST_VERSION" > .nvmrc
+
+nvm install -s || "'nvm install -s' failed"
+
+# Check
+[ -d ../../../$NVM_TEST_VERSION ] || die "$NVM_TEST_VERSION did not exist"
+nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION \
+  || die "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed"
+
+
--- a/test/installation/node/install
+++ b/test/installation/node/install
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+# 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
+
+# Check
+[ -d ../../../v0.9.7 ] || die "nvm install 0.9.7 didn't install"
+
+nvm use 0.9.7
+
+node --version | grep v0.9.7 > /dev/null || die "nvm use 0.9.7 failed"
+
+npm install -g is-nan@1.0.1 || die "npm install -g is-nan failed"
+npm list --global | grep is-nan > /dev/null || die "is-nan isn't installed"
+
+nvm ls 0.9 | grep v0.9.7 > /dev/null || die "nvm ls 0.9 didn't show v0.9.7"
+
+nvm install 0.9.12 --reinstall-packages-from=0.9 || die "nvm install 0.9.12 --reinstall-packages-from=0.9 failed"
+
+[ -d ../../../v0.9.12 ] || die "nvm install 0.9.12 didn't install"
+
+nvm use 0.9
+node --version | grep v0.9.12 > /dev/null || die "nvm ls 0.9 didn't use v0.9.12"
+
+npm list --global | grep is-nan > /dev/null || die "is-nan isn't installed"
+
--- a/test/installation/node/setup_dir
+++ b/test/installation/node/setup_dir
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ -f ".nvmrc" ]; then
+  mv .nvmrc .nvmrc.bak
+fi
+
--- a/test/installation/node/teardown_dir
+++ b/test/installation/node/teardown_dir
@@ -1,6 +1,7 @@
 #!/bin/sh

 . ../../../nvm.sh
+nvm deactivate
 nvm uninstall v0.10.7

 if [ -f ".nvmrc" ]; then
--- a/test/slow/Running
+++ b/test/slow/Running
@@ -7,8 +7,3 @@ die () { echo $@ ; exit 1; }
 nvm install 0.10

 [ "$(nvm current)" = "$(node -v)" ] || die "Failed to find current version: got \"$(nvm current)\", expected \"$(node -v)\""
-
-nvm install 0.6.21
-[ "$(node -v)" = "v0.6.21-pre" ] || die "v0.6.21-pre not installed with v0.6.21"
-[ "$(nvm current)" = "v0.6.21" ] || die "v0.6.21-pre not reported as v0.6.21"
-
--- a/Show More
+++ b/Show More