v0.18.0

Ensure that a system has manpath before invoking it.
Closes #531, fixes #557.
2025-09-10 08:39:07 +00:00 · 2014-11-05 10:59:59 -08:00 · 2014-11-02 13:54:54 -08:00 · 2014-11-02 13:43:28 -08:00 · 2014-11-01 02:18:10 -04:00 · 2014-10-30 10:24:53 -07:00
81 changed files with 2439 additions and 335 deletions
--- 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,14 +1,41 @@
 language: c # defaults to ruby
 install:
  - sudo apt-get install ksh zsh -y
+  - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
 before_script:
-  - curl -o /tmp/urchin https://raw.githubusercontent.com/scraperwiki/urchin/master/urchin && chmod +x /tmp/urchin
+  - '[ -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 test-$SHELL
 env:
+  - SHELL=sh TEST_SUITE=install_script
+  - SHELL=dash TEST_SUITE=install_script
+  - SHELL=bash TEST_SUITE=install_script
+  - SHELL=zsh TEST_SUITE=install_script
+  - SHELL=ksh TEST_SUITE=install_script
  - SHELL=sh TEST_SUITE=fast
  - SHELL=dash TEST_SUITE=fast
  - SHELL=bash TEST_SUITE=fast
  - SHELL=zsh TEST_SUITE=fast
  - SHELL=ksh TEST_SUITE=fast
  - SHELL=sh TEST_SUITE=slow
+  - SHELL=dash TEST_SUITE=slow
+  - SHELL=bash TEST_SUITE=slow
+  - SHELL=zsh TEST_SUITE=slow
+  - 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
+	# Note: With Travis CI:
+	#  - the path to urchin is passed via the command line.
+	#  - the other utilties 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.
+	export PATH := $(shell printf '%s' "$$(npm 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 ksh zsh
+	# Generate 'test-<shell>' target names from specified shells.
+	# The embedded shell names are extracted on demand inside the recipes.
+SHELL_TARGETS := $(addprefix test-,$(SHELLS))
+	# Determine if the installed Urchin version supports cross-shell testing, based on whether its usage information mentions the -s option.
+HAVE_CROSS_SHELL_TESTS := $(shell PATH="$(PATH)" $(URCHIN) -h | grep -qE '(^|\s)-s\s' && echo 'yes')
+NO_CROSS_SHELL_TESTS_WARNING := $(if $(HAVE_CROSS_SHELL_TESTS),,$(warning WARNING: This version of Urchin does not support cross-shell tests. All tests will run with 'sh'.))
+	# 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 $$(export -p | awk -F'[ =]' '$$2 ~ "^NVM_" { print $$2 }'); do unset $$v; done && unset v; \
+	 [ "$(HAVE_CROSS_SHELL_TESTS)" = 'yes' ] && targetShellOpt="-s $$shell" || targetShellOpt=; \
+	 for suite in $(TEST_SUITE); do $(URCHIN) -f $$targetShellOpt 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,31 +2,36 @@

 ## 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](http://github.com/hakobera/nvmw)
+ - [nvm-windows](http://github.com/coreybutler/nvm-windows)

 ### Install script

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

-    curl https://raw.githubusercontent.com/creationix/nvm/v0.11.2/install.sh | bash
+    curl https://raw.githubusercontent.com/creationix/nvm/v0.18.0/install.sh | bash

 or Wget:

-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.11.2/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.18.0/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:

@@ -38,7 +43,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`, and `nvm run` will all respect an `.nvmrc` file.
+`nvm use`, `nvm install`, `nvm exec`, and `nvm run` will all respect an `.nvmrc` file.

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

@@ -52,6 +57,22 @@ Or you can just run it:

    nvm run 0.10 --version

+Or, you can run any arbitrary command in a subshell with the desired version of node:
+
+    nvm exec 0.10 node --version
+
+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 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
@@ -66,7 +87,7 @@ 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`:

@@ -75,6 +96,8 @@ To use a mirror of the node binaries, set `$NVM_NODEJS_ORG_MIRROR`:

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

+`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

 nvm is released under the MIT license.
@@ -163,7 +186,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.11.2/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.18.0/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin

--- a/12
+++ b/12
@@ -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 copy-packages
+    current list ls list-remote ls-remote\
+    clear-cache deactivate unload
+    version'

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

@@ -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
@@ -18,7 +18,7 @@ nvm_download() {
    # Emulate curl with wget
    ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
                           -e 's/-L //' \
-                           -e 's/-I //' \
+                           -e 's/-I /--server-response /' \
                           -e 's/-s /-q /' \
                           -e 's/-o /-O /' \
                           -e 's/-C - /-c /')
@@ -44,12 +44,13 @@ install_nvm_from_git() {
    mkdir -p "$NVM_DIR"
    git clone "$NVM_SOURCE" "$NVM_DIR"
  fi
-  cd $NVM_DIR && git checkout v0.11.2 && git branch -D master
+  cd "$NVM_DIR" && git checkout v0.18.0 && git branch -D master >/dev/null 2>&1
+  return
 }

 install_nvm_as_script() {
  if [ -z "$NVM_SOURCE" ]; then
-    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.11.2/nvm.sh"
+    NVM_SOURCE="https://raw.githubusercontent.com/creationix/nvm/v0.18.0/nvm.sh"
  fi

  # Downloading to $NVM_DIR
@@ -65,67 +66,85 @@ install_nvm_as_script() {
  }
 }

-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
+}
+
+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
+
+  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_do_install nvm_has nvm_download install_nvm_as_script install_nvm_from_git nvm_reset nvm_detect_profile
+}
+
+[ "_$NVM_ENV" = "_testing" ] || nvm_do_install
--- a/nvm.sh
+++ b/nvm.sh
@@ -19,16 +19,16 @@ nvm_download() {
    # Emulate curl with wget
    ARGS=$(echo "$*" | sed -e 's/--progress-bar /--progress=bar /' \
                           -e 's/-L //' \
-                           -e 's/-I //' \
+                           -e 's/-I /--server-response /' \
                           -e 's/-s /-q /' \
                           -e 's/-o /-O /' \
                           -e 's/-C - /-c /')
-    wget $ARGS
+    eval wget $ARGS
  fi
 }

 nvm_has_system_node() {
-  [ "$(nvm deactivate 2> /dev/null && command -v node)" != '' ]
+  [ "$(nvm deactivate >/dev/null 2>&1 && command -v node)" != '' ]
 }

 # Make zsh glob matching behave same as bash
@@ -43,16 +43,35 @@ if [ -z "$NVM_DIR" ]; then
  if [ -n "$BASH_SOURCE" ]; then
    NVM_SCRIPT_SOURCE="${BASH_SOURCE[0]}"
  fi
-  export NVM_DIR=$(cd $NVM_CD_FLAGS $(dirname "${NVM_SCRIPT_SOURCE:-$0}") > /dev/null && pwd)
+  export NVM_DIR=$(cd $NVM_CD_FLAGS $(dirname "${NVM_SCRIPT_SOURCE:-$0}") > /dev/null && \pwd)
 fi
 unset NVM_SCRIPT_SOURCE 2> /dev/null


 # Setup mirror location if not already set
 if [ -z "$NVM_NODEJS_ORG_MIRROR" ]; then
-  export NVM_NODEJS_ORG_MIRROR="http://nodejs.org/dist"
+  export NVM_NODEJS_ORG_MIRROR="https://nodejs.org/dist"
 fi

+nvm_tree_contains_path() {
+  local tree
+  tree="$1"
+  local node_path
+  node_path="$2"
+
+  if [ "@$tree@" = "@@" ] || [ "@$node_path@" = "@@" ]; then
+    >&2 echo "both the tree and the node path are required"
+    return 2
+  fi
+
+  local pathdir
+  pathdir=$(dirname "$node_path")
+  while [ "$pathdir" != "" ] && [ "$pathdir" != "." ] && [ "$pathdir" != "/" ] && [ "$pathdir" != "$tree" ]; do
+    pathdir=$(dirname "$pathdir")
+  done
+  [ "$pathdir" = "$tree" ]
+}
+
 # Traverse up in directory tree to find containing folder
 nvm_find_up() {
  local path
@@ -74,11 +93,57 @@ nvm_find_nvmrc() {

 # Obtain nvm version from rc file
 nvm_rc_version() {
+  export NVM_RC_VERSION=''
  local NVMRC_PATH
  NVMRC_PATH="$(nvm_find_nvmrc)"
  if [ -e "$NVMRC_PATH" ]; then
    read NVM_RC_VERSION < "$NVMRC_PATH"
    echo "Found '$NVMRC_PATH' with version <$NVM_RC_VERSION>"
+  else
+    >&2 echo "No .nvmrc file found"
+    return 1
+  fi
+}
+
+nvm_version_greater() {
+  local LHS
+  LHS=$(nvm_normalize_version "$1")
+  local RHS
+  RHS=$(nvm_normalize_version "$2")
+  [ $LHS -gt $RHS ];
+}
+
+nvm_version_greater_than_or_equal_to() {
+  local LHS
+  LHS=$(nvm_normalize_version "$1")
+  local RHS
+  RHS=$(nvm_normalize_version "$2")
+  [ $LHS -ge $RHS ];
+}
+
+nvm_version_dir() {
+  local NVM_USE_NEW_DIR
+  NVM_USE_NEW_DIR="$1"
+  if [ -z "$NVM_USE_NEW_DIR" ] || [ "$NVM_USE_NEW_DIR" = "new" ]; then
+    echo "$NVM_DIR/versions"
+  elif [ "$NVM_USE_NEW_DIR" = "old" ]; then
+    echo "$NVM_DIR"
+  else
+    echo "unknown version dir" >&2
+    return 3
+  fi
+}
+
+nvm_version_path() {
+  local VERSION
+  VERSION="$1"
+  if [ -z "$VERSION" ]; then
+    echo "version is required" >&2
+    return 3
+  elif nvm_version_greater 0.12.0 "$VERSION"; then
+    echo "$(nvm_version_dir old)/$VERSION"
+  else
+    echo "$(nvm_version_dir new)/$VERSION"
  fi
 }

@@ -97,7 +162,7 @@ nvm_version() {
    return $?
  fi

-  VERSION=`nvm_ls $PATTERN | tail -n1`
+  VERSION="$(nvm_ls "$PATTERN" | tail -n1)"
  echo "$VERSION"

  if [ "$VERSION" = 'N/A' ]; then
@@ -107,22 +172,47 @@ nvm_version() {

 nvm_remote_version() {
  local PATTERN
-  PATTERN=$1
+  PATTERN="$1"
  local VERSION
-  VERSION=`nvm_ls_remote $PATTERN | tail -n1`
+  VERSION="$(nvm_ls_remote "$PATTERN" | tail -n1)"
  echo "$VERSION"

-  if [ "$VERSION" = 'N/A' ]; then
+  if [ "_$VERSION" = '_N/A' ]; then
    return 3
  fi
 }

 nvm_normalize_version() {
-  echo "$1" | sed -e 's/^v//' | awk -F. '{ printf("%d%03d%03d\n", $1,$2,$3); }'
+  echo "$1" | sed -e 's/^v//' | \awk -F. '{ printf("%d%06d%06d\n", $1,$2,$3); }'
+}
+
+nvm_ensure_version_prefix() {
+  echo "$1" | sed -e 's/^\([0-9]\)/v\1/g'
 }

 nvm_format_version() {
-  echo "$1" | sed -e 's/^\([0-9]\)/v\1/g'
+  local VERSION
+  VERSION="$(nvm_ensure_version_prefix "$1")"
+  if [ "_$(nvm_num_version_groups "$VERSION")" != "_3" ]; then
+    VERSION="$(echo "$VERSION" | sed -e 's/\.*$/.0/')"
+    nvm_format_version "$VERSION"
+  else
+    echo "$VERSION"
+  fi
+}
+
+nvm_num_version_groups() {
+  local VERSION
+  VERSION="$1"
+  if [ -z "$VERSION" ]; then
+    echo "0"
+    return
+  fi
+  local NVM_NUM_DOTS
+  NVM_NUM_DOTS=$(echo "$VERSION" | sed -e 's/^v//' | sed -e 's/\.$//' | sed -e 's/[^\.]//g')
+  local NVM_NUM_GROUPS
+  NVM_NUM_GROUPS=".$NVM_NUM_DOTS"
+  echo "${#NVM_NUM_GROUPS}"
 }

 nvm_strip_path() {
@@ -139,15 +229,98 @@ nvm_prepend_path() {

 nvm_binary_available() {
  # binaries started with node 0.8.6
-  local MINIMAL
-  MINIMAL="0.8.6"
-  local VERSION
-  VERSION=$1
-  [ $(nvm_normalize_version $VERSION) -ge $(nvm_normalize_version $MINIMAL) ]
+  local FIRST_VERSION_WITH_BINARY
+  FIRST_VERSION_WITH_BINARY="0.8.6"
+  nvm_version_greater_than_or_equal_to "$1" "$FIRST_VERSION_WITH_BINARY"
+}
+
+nvm_alias() {
+  local ALIAS
+  ALIAS="$1"
+  if [ -z "$ALIAS" ]; then
+    echo >&2 'An alias is required.'
+    return 1
+  fi
+
+  local NVM_ALIAS_PATH
+  NVM_ALIAS_PATH="$NVM_DIR/alias/$ALIAS"
+  if [ ! -f "$NVM_ALIAS_PATH" ]; then
+    echo >&2 'Alias does not exist.'
+    return 2
+  fi
+
+  cat "$NVM_ALIAS_PATH"
 }

 nvm_ls_current() {
-  echo `node -v 2>/dev/null`
+  local NODE_PATH
+  NODE_PATH="$(which node 2> /dev/null)"
+  if [ $? -ne 0 ]; then
+    echo 'none'
+  elif nvm_tree_contains_path "$NVM_DIR" "$NODE_PATH"; then
+    local VERSION
+    VERSION=`node -v 2>/dev/null`
+    if [ "$VERSION" = "v0.6.21-pre" ]; then
+      echo "v0.6.21"
+    else
+      echo "$VERSION"
+    fi
+  else
+    echo 'system'
+  fi
+}
+
+nvm_resolve_alias() {
+  if [ -z "$1" ]; then
+    return 1
+  fi
+
+  local PATTERN
+  PATTERN="$1"
+
+  local ALIAS
+  ALIAS="$PATTERN"
+  local ALIAS_TEMP
+
+  local SEEN_ALIASES
+  SEEN_ALIASES="$ALIAS"
+  while true; do
+    ALIAS_TEMP="$(nvm_alias "$ALIAS" 2> /dev/null)"
+
+    if [ -z "$ALIAS_TEMP" ]; then
+      break
+    fi
+
+    if [ -n "$ALIAS_TEMP" ] \
+      && printf "$SEEN_ALIASES" | \grep -e "^$ALIAS_TEMP$" > /dev/null; then
+      ALIAS="∞"
+      break
+    fi
+
+    SEEN_ALIASES="$SEEN_ALIASES\n$ALIAS_TEMP"
+    ALIAS="$ALIAS_TEMP"
+  done
+
+  if [ -n "$ALIAS" ] && [ "_$ALIAS" != "_$PATTERN" ]; then
+    if [ "_$ALIAS" = "_∞" ]; then
+      echo "$ALIAS"
+    else
+      nvm_version "$ALIAS"
+    fi
+    return 0
+  fi
+
+  if nvm_validate_implicit_alias "$PATTERN" 2> /dev/null ; then
+    local IMPLICIT
+    IMPLICIT="$(nvm_print_implicit_alias local "$PATTERN" 2> /dev/null)"
+    if [ -n "$IMPLICIT" ]; then
+      nvm_version "$IMPLICIT"
+      return $?
+    fi
+    return 3
+  fi
+
+  return 2
 }

 nvm_ls() {
@@ -160,43 +333,64 @@ nvm_ls() {
    return
  fi

-  if [ -f "$NVM_DIR/alias/$PATTERN" ]; then
-    nvm_version `cat $NVM_DIR/alias/$PATTERN`
+  if nvm_resolve_alias "$PATTERN"; then
    return
  fi
+
  # If it looks like an explicit version, don't do anything funny
-  if [ `expr "$PATTERN" : "v[0-9]*\.[0-9]*\.[0-9]*$"` != 0 ]; then
-    if [ -d "$NVM_DIR/$PATTERN" ]; then
+  PATTERN=$(nvm_ensure_version_prefix $PATTERN)
+  if [ "_$(echo "$PATTERN" | cut -c1-1)" = "_v" ] && [ "_$(nvm_num_version_groups "$PATTERN")" = "_3" ]; then
+    if [ -d "$(nvm_version_path "$PATTERN")" ]; then
      VERSIONS="$PATTERN"
    fi
  else
-    PATTERN=$(nvm_format_version $PATTERN)
-    if [ `expr "$PATTERN" : "v[0-9]*\.[0-9]*$"` != 0 ]; then
-      PATTERN="$PATTERN."
+    if [ "_$PATTERN" != "_system" ]; then
+      local NUM_VERSION_GROUPS
+      NUM_VERSION_GROUPS="$(nvm_num_version_groups "$PATTERN")"
+      if [ "_$NUM_VERSION_GROUPS" = "_2" ] || [ "_$NUM_VERSION_GROUPS" = "_1" ]; then
+        PATTERN="$(echo "$PATTERN" | sed -e 's/\.*$//g')."
+      fi
+    fi
+    if [ -d "$(nvm_version_dir new)" ]; then
+      VERSIONS=`find "$(nvm_version_dir new)/" "$(nvm_version_dir old)/" -maxdepth 1 -type d -name "$PATTERN*" -exec basename '{}' ';' \
+        | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n | \grep -v '^ *\.' | \grep -e '^v' | \grep -v -e '^versions$'`
+    else
+      VERSIONS=`find "$(nvm_version_dir old)/" -maxdepth 1 -type d -name "$PATTERN*" -exec basename '{}' ';' \
+        | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n | \grep -v '^ *\.' | \grep -e '^v'`
    fi
-    VERSIONS=`find "$NVM_DIR/" -maxdepth 1 -type d -name "$PATTERN*" -exec basename '{}' ';' \
-      | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n | \grep -v '^ *\.'`
  fi
+
+  if nvm_has_system_node; then
+    if [ -z "$PATTERN" ]; then
+      VERSIONS="$VERSIONS$(printf '\n%s' 'system')"
+    elif [ "$PATTERN" = 'system' ]; then
+      VERSIONS="$(printf '%s' 'system')"
+    fi
+  fi
+
  if [ -z "$VERSIONS" ]; then
    echo "N/A"
    return 3
  fi
+
  echo "$VERSIONS"
  return
 }

 nvm_ls_remote() {
  local PATTERN
-  PATTERN=$1
+  PATTERN="$1"
  local VERSIONS
  local GREP_OPTIONS
  GREP_OPTIONS=''
-  if [ -n "$PATTERN" ]; then
-    PATTERN=`nvm_format_version "$PATTERN"`
+  if nvm_validate_implicit_alias "$PATTERN" 2> /dev/null ; then
+    PATTERN="$(nvm_remote_version "$(nvm_print_implicit_alias remote "$PATTERN")")"
+  elif [ -n "$PATTERN" ]; then
+    PATTERN="$(nvm_ensure_version_prefix "$PATTERN")"
  else
    PATTERN=".*"
  fi
-  VERSIONS=`nvm_download -s $NVM_NODEJS_ORG_MIRROR/ -o - \
+  VERSIONS=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/ -o - \
              | \egrep -o 'v[0-9]+\.[0-9]+\.[0-9]+' \
              | \grep -w "${PATTERN}" \
              | sort -t. -u -k 1.2,1n -k 2,2n -k 3,3n`
@@ -209,15 +403,15 @@ nvm_ls_remote() {
 }

 nvm_checksum() {
-  if nvm_has "shasum"; then
-    checksum=$(shasum $1 | awk '{print $1}')
+  if nvm_has "sha1sum"; then
+    checksum="$(sha1sum "$1" | \awk '{print $1}')"
  elif nvm_has "sha1"; then
-    checksum=$(sha1 -q $1)
+    checksum="$(sha1 -q "$1")"
  else
-    checksum=$(sha1sum $1 | awk '{print $1}')
+    checksum="$(shasum "$1" | \awk '{print $1}')"
  fi

-  if [ "$checksum" = "$2" ]; then
+  if [ "_$checksum" = "_$2" ]; then
    return
  elif [ -z "$2" ]; then
    echo 'Checksums empty' #missing in raspberry pi binary
@@ -236,8 +430,10 @@ nvm_print_versions() {
  echo "$1" | while read VERSION; do
    if [ "$VERSION" = "$NVM_CURRENT" ]; then
      FORMAT='\033[0;32m-> %9s\033[0m'
-    elif [ -d "$NVM_DIR/$VERSION" ]; then
+    elif [ -d "$(nvm_version_path "$VERSION" 2> /dev/null)" ]; then
      FORMAT='\033[0;34m%12s\033[0m'
+    elif [ "$VERSION" = "system" ]; then
+      FORMAT='\033[0;33m%12s\033[0m'
    else
      FORMAT='%12s'
    fi
@@ -245,6 +441,59 @@ nvm_print_versions() {
  done
 }

+nvm_validate_implicit_alias() {
+  if [ "_$1" != "_stable" ] && [ "_$1" != "_unstable" ]; then
+    echo "Only implicit aliases 'stable' and 'unstable' are supported." >&2
+    return 1
+  fi
+}
+
+nvm_print_implicit_alias() {
+  if [ "_$1" != "_local" ] && [ "_$1" != "_remote" ]; then
+    echo "nvm_print_implicit_alias must be specified with local or remote as the first argument." >&2
+    return 1
+  fi
+
+  if ! nvm_validate_implicit_alias "$2"; then
+    return 2
+  fi
+
+  local LAST_TWO
+  if [ "_$1" = "_local" ]; then
+    LAST_TWO=$(nvm_ls | \grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
+  else
+    LAST_TWO=$(nvm_ls_remote | \grep -e '^v' | cut -c2- | cut -d . -f 1,2 | uniq)
+  fi
+  local MINOR
+  local STABLE
+  local UNSTABLE
+  local MOD
+
+  local ZHS_HAS_SHWORDSPLIT_UNSET
+  ZHS_HAS_SHWORDSPLIT_UNSET=1
+  if nvm_has "setopt"; then
+    ZHS_HAS_SHWORDSPLIT_UNSET=$(setopt | \grep shwordsplit > /dev/null ; echo $?)
+    setopt shwordsplit
+  fi
+  for MINOR in $LAST_TWO; do
+    MOD=$(expr "$(nvm_normalize_version "$MINOR")" \/ 1000000 \% 2)
+    if [ $MOD -eq 0 ]; then
+      STABLE="$MINOR"
+    elif [ $MOD -eq 1 ]; then
+      UNSTABLE="$MINOR"
+    fi
+  done
+  if [ $ZHS_HAS_SHWORDSPLIT_UNSET -eq 1 ] && nvm_has "unsetopt"; then
+    unsetopt shwordsplit
+  fi
+
+  if [ "_$2" = "_stable" ]; then
+    echo $STABLE
+  elif [ "_$2" = "_unstable" ]; then
+    echo $UNSTABLE
+  fi
+}
+
 nvm() {
  if [ $# -lt 1 ]; then
    nvm help
@@ -348,29 +597,46 @@ nvm() {
        nobinary=1
      fi

-      provided_version=$1
+      provided_version="$1"
+
      if [ -z "$provided_version" ]; then
        if [ $version_not_provided -ne 1 ]; then
          nvm_rc_version
        fi
        provided_version="$NVM_RC_VERSION"
+      else
+        shift
      fi
-      [ -d "$NVM_DIR/$provided_version" ] && echo "$provided_version is already installed." >&2 && return

-      VERSION=`nvm_remote_version $provided_version`
+      VERSION="$(nvm_remote_version "$provided_version")"
      ADDITIONAL_PARAMETERS=''
-
-      shift
+      local PROVIDED_COPY_PACKAGES_FROM
+      local COPY_PACKAGES_FROM

      while [ $# -ne 0 ]
      do
-        ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
+        if [ "_$(echo "$1" | cut -c 1-21)" = "_--copy-packages-from=" ]; then
+          PROVIDED_COPY_PACKAGES_FROM="$(echo "$1" | cut -c 22-)"
+          COPY_PACKAGES_FROM="$(nvm_version "$PROVIDED_COPY_PACKAGES_FROM")"
+        else
+          ADDITIONAL_PARAMETERS="$ADDITIONAL_PARAMETERS $1"
+        fi
        shift
      done

-      if [ -d "$NVM_DIR/$VERSION" ]; then
+      if [ "_$(nvm_ensure_version_prefix "$PROVIDED_COPY_PACKAGES_FROM")" = "_$VERSION" ]; then
+        echo "You can't copy global packages from the same version of node you're installing." >&2
+        return 4
+      elif [ ! -z "$PROVIDED_COPY_PACKAGES_FROM" ] && [ "_$COPY_PACKAGES_FROM" = "_N/A" ]; then
+        echo "If --copy-packages-from is provided, it must point to an installed version of node." >&2
+        return 5
+      fi
+
+      if [ -d "$(nvm_version_path "$VERSION")" ]; then
        echo "$VERSION is already installed." >&2
-        nvm use "$VERSION"
+        if nvm use "$VERSION" && [ ! -z "$COPY_PACKAGES_FROM" ] && [ "_$COPY_PACKAGES_FROM" != "_N/A" ]; then
+          nvm copy-packages "$COPY_PACKAGES_FROM"
+        fi
        return $?
      fi

@@ -386,7 +652,7 @@ nvm() {
          if nvm_binary_available "$VERSION"; then
            t="$VERSION-$os-$arch"
            url="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-${t}.tar.gz"
-            sum=`nvm_download -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-${t}.tar.gz | awk '{print $1}'`
+            sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-${t}.tar.gz | \awk '{print $1}'`
            local tmpdir
            tmpdir="$NVM_DIR/bin/node-${t}"
            local tmptarball
@@ -397,10 +663,12 @@ nvm() {
              nvm_checksum "$tmptarball" $sum && \
              tar -xzf "$tmptarball" -C "$tmpdir" --strip-components 1 && \
              rm -f "$tmptarball" && \
-              mv "$tmpdir" "$NVM_DIR/$VERSION"
+              mv "$tmpdir" "$(nvm_version_path "$VERSION")"
              )
            then
-              nvm use $VERSION
+              if nvm use "$VERSION" && [ ! -z "$COPY_PACKAGES_FROM" ] && [ "_$COPY_PACKAGES_FROM" != "_N/A" ]; then
+                nvm copy-packages "$COPY_PACKAGES_FROM"
+              fi
              return $?
            else
              echo "Binary download failed, trying source." >&2
@@ -410,7 +678,9 @@ nvm() {
        fi
      fi

-      echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"
+      if [ -n "$ADDITIONAL_PARAMETERS" ]; then
+        echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"
+      fi

      tarball=''
      sum=''
@@ -423,10 +693,10 @@ nvm() {
      tmpdir="$NVM_DIR/src"
      local tmptarball
      tmptarball="$tmpdir/node-$VERSION.tar.gz"
-      if [ "`nvm_download -s -I "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" -o - | \grep '200 OK'`" != '' ]; then
+      if [ "`nvm_download -L -s -I "$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz" -o - 2>&1 | \grep '200 OK'`" != '' ]; then
        tarball="$NVM_NODEJS_ORG_MIRROR/$VERSION/node-$VERSION.tar.gz"
-        sum=`nvm_download -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-$VERSION.tar.gz | awk '{print $1}'`
-      elif [ "`nvm_download -s -I "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" -o - | \grep '200 OK'`" != '' ]; then
+        sum=`nvm_download -L -s $NVM_NODEJS_ORG_MIRROR/$VERSION/SHASUMS.txt -o - | \grep node-$VERSION.tar.gz | \awk '{print $1}'`
+      elif [ "`nvm_download -L -s -I "$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz" -o - | \grep '200 OK'`" != '' ]; then
        tarball="$NVM_NODEJS_ORG_MIRROR/node-$VERSION.tar.gz"
      fi
      if (
@@ -436,41 +706,45 @@ nvm() {
        nvm_checksum "$tmptarball" $sum && \
        tar -xzf "$tmptarball" -C "$tmpdir" && \
        cd "$tmpdir/node-$VERSION" && \
-        ./configure --prefix="$NVM_DIR/$VERSION" $ADDITIONAL_PARAMETERS && \
+        ./configure --prefix="$(nvm_version_path "$VERSION")" $ADDITIONAL_PARAMETERS && \
        $make $MAKE_CXX && \
-        rm -f "$NVM_DIR/$VERSION" 2>/dev/null && \
+        rm -f "$(nvm_version_path "$VERSION")" 2>/dev/null && \
        $make $MAKE_CXX install
        )
      then
-        nvm use $VERSION
+        if nvm use "$VERSION" && [ ! -z "$COPY_PACKAGES_FROM" ] && [ "_$COPY_PACKAGES_FROM" != "_N/A" ]; then
+          nvm copy-packages "$COPY_PACKAGES_FROM"
+        fi
        if ! nvm_has "npm" ; then
          echo "Installing npm..."
-          if [ "`expr "$VERSION" : '\(^v0\.1\.\)'`" != '' ]; then
+          if nvm_version_greater 0.2.0 "$VERSION"; then
            echo "npm requires node v0.2.3 or higher" >&2
-          elif [ "`expr "$VERSION" : '\(^v0\.2\.\)'`" != '' ]; then
-            if [ "`expr "$VERSION" : '\(^v0\.2\.[0-2]$\)'`" != '' ]; then
+          elif nvm_version_greater_than_or_equal_to "$VERSION" 0.2.0; then
+            if nvm_version_greater 0.2.3 "$VERSION"; then
              echo "npm requires node v0.2.3 or higher" >&2
            else
-              nvm_download https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh
+              nvm_download -L https://npmjs.org/install.sh -o - | clean=yes npm_install=0.2.19 sh
            fi
          else
-            nvm_download https://npmjs.org/install.sh -o - | clean=yes sh
+            nvm_download -L https://npmjs.org/install.sh -o - | clean=yes sh
          fi
        fi
      else
        echo "nvm: install $VERSION failed!" >&2
        return 1
      fi
+
+      return $?
    ;;
    "uninstall" )
      [ $# -ne 2 ] && nvm help && return
-      PATTERN=`nvm_format_version $2`
+      PATTERN=`nvm_ensure_version_prefix $2`
      if [ "$PATTERN" = `nvm_version` ]; then
        echo "nvm: Cannot uninstall currently-active node version, $PATTERN." >&2
        return 1
      fi
      VERSION=`nvm_version $PATTERN`
-      if [ ! -d $NVM_DIR/$VERSION ]; then
+      if [ ! -d "$(nvm_version_path "$VERSION")" ]; then
        echo "$VERSION version is not installed..." >&2
        return;
      fi
@@ -482,7 +756,7 @@ nvm() {
             "$NVM_DIR/src/node-$VERSION.tar.gz" \
             "$NVM_DIR/bin/node-${t}" \
             "$NVM_DIR/bin/node-${t}.tar.gz" \
-             "$NVM_DIR/$VERSION" 2>/dev/null
+             "$(nvm_version_path "$VERSION")" 2>/dev/null
      echo "Uninstalled node $VERSION"

      # Rm any aliases that point to uninstalled version.
@@ -493,24 +767,30 @@ nvm() {

    ;;
    "deactivate" )
-      if [ `expr "$PATH" : ".*$NVM_DIR/.*/bin.*"` != 0 ] ; then
-        export PATH=`nvm_strip_path "$PATH" "/bin"`
+      local NEWPATH
+      NEWPATH="$(nvm_strip_path "$PATH" "/bin")"
+      if [ "$PATH" = "$NEWPATH" ]; then
+        echo "Could not find $NVM_DIR/*/bin in \$PATH" >&2
+      else
+        export PATH="$NEWPATH"
        hash -r
        echo "$NVM_DIR/*/bin removed from \$PATH"
-      else
-        echo "Could not find $NVM_DIR/*/bin in \$PATH" >&2
      fi
-      if [ `expr "$MANPATH" : ".*$NVM_DIR/.*/share/man.*"` != 0 ] ; then
-        export MANPATH=`nvm_strip_path "$MANPATH" "/share/man"`
-        echo "$NVM_DIR/*/share/man removed from \$MANPATH"
-      else
+
+      NEWPATH="$(nvm_strip_path "$MANPATH" "/share/man")"
+      if [ "$MANPATH" = "$NEWPATH" ]; then
        echo "Could not find $NVM_DIR/*/share/man in \$MANPATH" >&2
-      fi
-      if [ `expr "$NODE_PATH" : ".*$NVM_DIR/.*/lib/node_modules.*"` != 0 ] ; then
-        export NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"`
-        echo "$NVM_DIR/*/lib/node_modules removed from \$NODE_PATH"
      else
+        export MANPATH="$NEWPATH"
+        echo "$NVM_DIR/*/share/man removed from \$MANPATH"
+      fi
+
+      NEWPATH="$(nvm_strip_path "$NODE_PATH" "/lib/node_modules")"
+      if [ "$NODE_PATH" = "$NEWPATH" ]; then
        echo "Could not find $NVM_DIR/*/lib/node_modules in \$NODE_PATH" >&2
+      else
+        export NODE_PATH="$NEWPATH"
+        echo "$NVM_DIR/*/lib/node_modules removed from \$NODE_PATH"
      fi
    ;;
    "use" )
@@ -523,42 +803,61 @@ nvm() {
        if [ -n "$NVM_RC_VERSION" ]; then
          VERSION=`nvm_version $NVM_RC_VERSION`
        fi
+      elif [ "_$2" != '_system' ]; then
+        VERSION="$(nvm_version "$2")"
      else
-        VERSION=`nvm_version $2`
+        VERSION="$2"
      fi
      if [ -z "$VERSION" ]; then
        nvm help
        return 127
      fi
-      if [ -z "$VERSION" ]; then
-        VERSION=`nvm_version $2`
+
+      if [ "_$VERSION" = '_system' ]; then
+        if nvm_has_system_node && nvm deactivate >/dev/null 2>&1; then
+          echo "Now using system version of node: $(node -v 2>/dev/null)."
+          return
+        else
+          echo "System version of node not found." >&2
+          return 127
+        fi
+      elif [ "_$VERSION" = "_∞" ]; then
+        echo "The alias \"$2\" leads to an infinite loop. Aborting." >&2
+        return 8
      fi
-      if [ ! -d "$NVM_DIR/$VERSION" ]; then
+
+      local NVM_VERSION_DIR
+      NVM_VERSION_DIR="$(nvm_version_path "$VERSION")"
+      if [ ! -d "$NVM_VERSION_DIR" ]; then
        echo "$VERSION version is not installed yet" >&2
        return 1
      fi
      # Strip other version from PATH
      PATH=`nvm_strip_path "$PATH" "/bin"`
      # Prepend current version
-      PATH=`nvm_prepend_path "$PATH" "$NVM_DIR/$VERSION/bin"`
-      if [ -z "$MANPATH" ]; then
-        MANPATH=$(manpath)
+      PATH=`nvm_prepend_path "$PATH" "$NVM_VERSION_DIR/bin"`
+      if nvm_has manpath; then
+        if [ -z "$MANPATH" ]; then
+          MANPATH=$(manpath)
+        fi
+        # Strip other version from MANPATH
+        MANPATH=`nvm_strip_path "$MANPATH" "/share/man"`
+        # Prepend current version
+        MANPATH=`nvm_prepend_path "$MANPATH" "$NVM_VERSION_DIR/share/man"`
+        export MANPATH
      fi
-      # Strip other version from MANPATH
-      MANPATH=`nvm_strip_path "$MANPATH" "/share/man"`
-      # Prepend current version
-      MANPATH=`nvm_prepend_path "$MANPATH" "$NVM_DIR/$VERSION/share/man"`
      # Strip other version from NODE_PATH
      NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"`
      # Prepend current version
-      NODE_PATH=`nvm_prepend_path "$NODE_PATH" "$NVM_DIR/$VERSION/lib/node_modules"`
+      NODE_PATH=`nvm_prepend_path "$NODE_PATH" "$NVM_VERSION_DIR/lib/node_modules"`
      export PATH
      hash -r
-      export MANPATH
      export NODE_PATH
-      export NVM_PATH="$NVM_DIR/$VERSION/lib/node"
-      export NVM_BIN="$NVM_DIR/$VERSION/bin"
-      rm -f "$NVM_DIR/current" && ln -s "$NVM_DIR/$VERSION" "$NVM_DIR/current"
+      export NVM_PATH="$NVM_VERSION_DIR/lib/node"
+      export NVM_BIN="$NVM_VERSION_DIR/bin"
+      if [ "$NVM_SYMLINK_CURRENT" = true ]; then
+        rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current"
+      fi
      echo "Now using node $VERSION"
    ;;
    "run" )
@@ -583,7 +882,7 @@ nvm() {
      provided_version=$1
      if [ -n "$provided_version" ]; then
        VERSION=`nvm_version $provided_version`
-        if [ $VERSION = "N/A" ]; then
+        if [ "_$VERSION" = "_N/A" ]; then
          provided_version=''
          if [ $has_checked_nvmrc -ne 1 ]; then
            nvm_rc_version && has_checked_nvmrc=1
@@ -594,14 +893,40 @@ nvm() {
        fi
      fi

-      if [ ! -d "$NVM_DIR/$VERSION" ]; then
+      echo "Running node $VERSION"
+      local ARGS
+      ARGS="$@"
+      local OUTPUT
+      OUTPUT="$(nvm use "$VERSION" >/dev/null && node "$ARGS")"
+      local EXIT_CODE
+      EXIT_CODE="$?"
+      echo "$OUTPUT"
+      return $EXIT_CODE
+    ;;
+    "exec" )
+      shift
+
+      local provided_version
+      provided_version="$1"
+      if [ -n "$provided_version" ]; then
+        VERSION=`nvm_version $provided_version`
+        if [ $VERSION = "N/A" ]; then
+          provided_version=''
+          nvm_rc_version
+          VERSION="$(nvm_version "$NVM_RC_VERSION")"
+        else
+          shift
+        fi
+      fi
+
+      local NVM_VERSION_DIR
+      NVM_VERSION_DIR=$(nvm_version_path "$VERSION")
+      if [ ! -d "$NVM_VERSION_DIR" ]; then
        echo "$VERSION version is not installed yet" >&2
        return 1
      fi
-      RUN_NODE_PATH=`nvm_strip_path "$NODE_PATH" "/lib/node_modules"`
-      RUN_NODE_PATH=`nvm_prepend_path "$NODE_PATH" "$NVM_DIR/$VERSION/lib/node_modules"`
      echo "Running node $VERSION"
-      NODE_PATH=$RUN_NODE_PATH $NVM_DIR/$VERSION/bin/node "$@"
+      NODE_VERSION=$VERSION $NVM_DIR/nvm-exec "$@"
    ;;
    "ls" | "list" )
      local NVM_LS_OUTPUT
@@ -615,41 +940,56 @@ nvm() {
      return $NVM_LS_EXIT_CODE
    ;;
    "ls-remote" | "list-remote" )
-      nvm_print_versions "`nvm_ls_remote $2`"
-      return
+      local NVM_LS_EXIT_CODE
+      NVM_LS_OUTPUT=$(nvm_ls_remote "$2")
+      NVM_LS_EXIT_CODE=$?
+      nvm_print_versions "$NVM_LS_OUTPUT"
+      return $NVM_LS_EXIT_CODE
    ;;
    "current" )
      nvm_version current
    ;;
    "alias" )
-      mkdir -p $NVM_DIR/alias
+      mkdir -p "$NVM_DIR/alias"
      if [ $# -le 2 ]; then
        local DEST
-        for ALIAS in $NVM_DIR/alias/$2*; do
-          if [ -e "$ALIAS" ]; then
-            DEST=`cat $ALIAS`
-            VERSION=`nvm_version $DEST`
-            if [ "$DEST" = "$VERSION" ]; then
-              echo "$(basename $ALIAS) -> $DEST"
+        for ALIAS_PATH in "$NVM_DIR"/alias/"$2"*; do
+          ALIAS="$(basename "$ALIAS_PATH")"
+          DEST="$(nvm_alias "$ALIAS" 2> /dev/null)"
+          if [ -n "$DEST" ]; then
+            VERSION="$(nvm_version "$DEST")"
+            if [ "_$DEST" = "_$VERSION" ]; then
+              echo "$ALIAS -> $DEST"
            else
-              echo "$(basename $ALIAS) -> $DEST (-> $VERSION)"
+              echo "$ALIAS -> $DEST (-> $VERSION)"
+            fi
+          fi
+        done
+
+        for ALIAS in "stable" "unstable"; do
+          if [ ! -f "$NVM_DIR/alias/$ALIAS" ]; then
+            if [ $# -lt 2 ] || [ "~$ALIAS" = "~$2" ]; then
+              DEST="$(nvm_print_implicit_alias local "$ALIAS")"
+              if [ "_$DEST" != "_" ]; then
+                VERSION="$(nvm_version "$DEST")"
+                echo "$ALIAS -> $DEST (-> $VERSION) (default)"
+              fi
            fi
          fi
        done
        return
      fi
      if [ -z "$3" ]; then
-        rm -f $NVM_DIR/alias/$2
+        rm -f "$NVM_DIR/alias/$2"
        echo "$2 -> *poof*"
        return
      fi
-      mkdir -p $NVM_DIR/alias
-      VERSION=`nvm_version $3`
+      VERSION="$(nvm_version "$3")"
      if [ $? -ne 0 ]; then
        echo "! WARNING: Version '$3' does not exist." >&2
      fi
      echo $3 > "$NVM_DIR/alias/$2"
-      if [ ! "$3" = "$VERSION" ]; then
+      if [ ! "_$3" = "_$VERSION" ]; then
        echo "$2 -> $3 (-> $VERSION)"
      else
        echo "$2 -> $3"
@@ -667,30 +1007,43 @@ nvm() {
        nvm help
        return 127
      fi
-      VERSION=`nvm_version $2`
-      local ROOT
-      ROOT=`(nvm use $VERSION && npm -g root)`
-      local ROOTDEPTH
-      ROOTDEPTH=$((`echo $ROOT | sed 's/[^\/]//g'|wc -m` -1))

-      # declare local INSTALLS first, otherwise it doesn't work in zsh
+      local PROVIDED_VERSION
+      PROVIDED_VERSION="$2"
+
+      if [ "$PROVIDED_VERSION" = "$(nvm_ls_current)" ] || [ "$(nvm_version $PROVIDED_VERSION)" = "$(nvm_ls_current)" ]; then
+        echo 'Can not copy packages from the current version of node.' >&2
+        return 2
+      fi
+
      local INSTALLS
-      INSTALLS=`nvm use $VERSION > /dev/null && npm -g -p ll | \grep "$ROOT\/[^/]\+$" | cut -d '/' -f $(($ROOTDEPTH + 2)) | cut -d ":" -f 2 | \grep -v npm | tr "\n" " "`
+      if [ "$PROVIDED_VERSION" = "system" ]; then
+        if ! nvm_has_system_node; then
+          echo 'No system version of node detected.' >&2
+          return 3
+        fi
+        INSTALLS=$(nvm deactivate > /dev/null && npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | xargs)
+      else
+        local VERSION
+        VERSION="$(nvm_version "$PROVIDED_VERSION")"
+        INSTALLS=$(nvm use "$VERSION" > /dev/null && npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | xargs)
+      fi

-      npm install -g ${INSTALLS[@]}
+      echo "Copying global packages from $VERSION..."
+      echo "$INSTALLS" | xargs npm install -g --quiet
    ;;
    "clear-cache" )
-      rm -f $NVM_DIR/v* 2>/dev/null
+      rm -f $NVM_DIR/v* "$(nvm_version_dir)" 2>/dev/null
      echo "Cache cleared."
    ;;
    "version" )
      nvm_version $2
    ;;
    "--version" )
-      echo "0.11.2"
+      echo "0.18.0"
    ;;
    "unload" )
-      unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version > /dev/null 2>&1
+      unset -f nvm nvm_print_versions nvm_checksum nvm_ls_remote nvm_ls nvm_remote_version nvm_version nvm_rc_version nvm_version_greater nvm_version_greater_than_or_equal_to > /dev/null 2>&1
      unset RC_VERSION NVM_NODEJS_ORG_MIRROR NVM_DIR NVM_CD_FLAGS > /dev/null 2>&1
    ;;
    * )
@@ -699,5 +1052,9 @@ nvm() {
  esac
 }

-nvm ls default >/dev/null && nvm use default >/dev/null || true
+if nvm ls default >/dev/null; then
+  nvm use default >/dev/null
+elif nvm_rc_version >/dev/null 2>&1; then
+  nvm use >/dev/null
+fi

--- a/package.json
+++ b/package.json
@@ -1,14 +1,17 @@
 {
  "name": "nvm",
-  "version": "0.11.2",
+  "version": "0.18.0",
  "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": {
+    "replace": "~0.3.0",
+    "semver": "~4.1.0",
    "urchin": "~0.0.2"
  }
 }
-
--- 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,18 @@
+#!/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"
+
+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"
+
--- a/test/fast/Aliases/Running
+++ b/test/fast/Aliases/Running
@@ -0,0 +1,37 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+cleanup () {
+  rm -rf ../../../alias/stable
+  rm -rf ../../../alias/unstable
+  rm -rf ../../../v0.8.1
+  rm -rf ../../../v0.9.1
+}
+
+mkdir ../../../v0.8.1
+mkdir ../../../v0.9.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_OUTPUT=$(nvm alias)
+
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^stable -> $EXPECTED_UNSTABLE (-> $UNSTABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'stable' alias"
+
+echo "$NVM_ALIAS_OUTPUT" | \grep -e "^unstable -> $EXPECTED_STABLE (-> $STABLE_VERSION)$" \
+  || die "nvm alias did not contain the overridden 'unstable' 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/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_resolve_alias
+++ b/test/fast/Aliases/nvm_resolve_alias
@@ -0,0 +1,28 @@
+#!/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.10" ] || die "'nvm_resolve_alias stable' was not v0.0.10; got $STABLE"
+
+UNSTABLE="$(nvm_resolve_alias unstable)"
+[ "_$UNSTABLE" = "_v0.1.10" ] || die "'nvm_resolve_alias unstable' was not v0.1.10; got $UNSTABLE"
+
--- a/test/fast/Aliases/setup
+++ b/test/fast/Aliases/setup
@@ -0,0 +1,9 @@
+#!/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
+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,13 @@
+#!/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"
+done
+
+rm -f "../../../alias/stable"
+rm -f "../../../alias/unstable"
+
--- 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
@@ -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
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mkdir ../../../v0.1.3
+mkdir ../../../v0.2.3
+mkdir ../../../versions
+
+. ../../../nvm.sh
+
+[ -z "$(nvm ls | \grep 'versions')" ]
+# The result should contain only the appropriate version numbers.
+
--- 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 | grep system 2>&1 > /dev/null
+[ $? -eq 0 ] || die '"nvm ls" did not contain "system" when system node is present'
+
+nvm_has_system_node() { return 1; }
+nvm ls | grep system 2>&1 > /dev/null
+[ $? -ne 0 ] || die '"nvm ls" contained "system" when system node is not present'
+
--- a/test/fast/Listing
+++ b/test/fast/Listing
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+mkdir -p ../../../versions/v0.12.1
+mkdir ../../../v0.1.3
+
+. ../../../nvm.sh
+
+nvm ls 0.12 | grep v0.12.1 || die '"nvm ls" did not list a version in the versions/ directory'
+nvm ls 0.1 | grep v0.1.3 || die '"nvm ls" did not list a version not in the versions/ directory'
+
--- 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,11 +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
-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
@@ -3,4 +3,8 @@
 die () { echo $@ ; exit 1; }

 . ../../nvm.sh
-[ "$(nvm current)" = "$(node -v)" ] || die "Failed to find current version"
+
+nvm deactivate 2>&1
+
+[ "$(nvm current)" = "system" ] || [ "$(nvm current)" = "none" ] || die '"nvm current" did not report "system" or "none" when deactivated'
+
--- 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 --copy-packages-from=0.11 2>&1)"
+EXPECTED_ERROR_MSG="If --copy-packages-from is provided, it must point to an installed version of node."
+[ "~$INSTALL_ERROR_MSG" = "~$EXPECTED_ERROR_MSG" ] \
+  || die ""nvm install --copy-packages" should fail when given an uninstalled version: expected '$EXPECTED_ERROR_MSG', got '$INSTALL_ERROR_MSG'"
+
+INSTALL_EXIT_CODE="$(nvm install v0.10.5 --copy-packages-from=0.11 >/dev/null 2>&1; echo $?)"
+[ "~$INSTALL_EXIT_CODE" = "~5" ] \
+  || die ""nvm install --copy-packages" should exit with code 5 when given an uninstalled version, got $INSTALL_EXIT_CODE"
+
+INSTALL_ERROR_MSG="$(nvm install v0.10.5 --copy-packages-from=0.10.5 2>&1)"
+EXPECTED_ERROR_MSG="You can't copy global packages from the same version of node you're installing."
+[ "~$INSTALL_ERROR_MSG" = "~$EXPECTED_ERROR_MSG" ] \
+  || die ""nvm install --copy-packages" should fail when given the same version: expected '$EXPECTED_ERROR_MSG', got '$INSTALL_ERROR_MSG'"
+
+INSTALL_EXIT_CODE="$(nvm install v0.10.5 --copy-packages-from=0.10.5 >/dev/null 2>&1; echo $?)"
+[ "~$INSTALL_EXIT_CODE" = "~4" ] \
+  || die ""nvm install --copy-packages" 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,13 @@
+#!/bin/sh
+
+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_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 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
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+. ../../nvm.sh
+
+TEST_NODE_VERSION="v0.10.29"
+
+TEST_COUNT=0
+TEST_PASSED=0
+TEST_FAILED=0
+
+function registerExpectedSymlink() {
+  registerResult ${1}
+}
+
+function registerExpectedNoSymlink() {
+  [ ${1} -ne 0 ]
+  registerResult $?
+}
+
+function registerResult() {
+  result=${1}
+
+  TEST_COUNT=$(($TEST_COUNT + 1))
+
+  [ ${result} -eq 0 ] \
+    && TEST_PASSED=$(($TEST_PASSED + 1)) \
+    || TEST_FAILED=$(($TEST_FAILED + 1))
+}
+
+function cleanup() {
+  rm -rf ../../${TEST_NODE_VERSION}
+  rm -f ../../current
+}
+
+function runNvmUse() {
+  mkdir ../../${TEST_NODE_VERSION}
+  nvm use ${TEST_NODE_VERSION} > /dev/null 2>&1
+  rmdir ../../${TEST_NODE_VERSION}
+}
+
+function isCurrentSymlinkPresent() {
+  [ -L ../../current ]
+}
+
+NVM_SYMLINK_CURRENT=false
+cleanup
+runNvmUse
+isCurrentSymlinkPresent && echo >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=false!"
+registerExpectedNoSymlink $?
+
+NVM_SYMLINK_CURRENT=true
+cleanup
+runNvmUse
+isCurrentSymlinkPresent || echo >&2 "Expected 'current' symlink to be created when NVM_SYMLINK_CURRENT=true!"
+registerExpectedSymlink $?
+
+NVM_SYMLINK_CURRENT=garbagevalue
+cleanup
+runNvmUse
+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 >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=0!"
+registerExpectedNoSymlink $?
+
+NVM_SYMLINK_CURRENT=1
+cleanup
+runNvmUse
+isCurrentSymlinkPresent && echo >&2 "Expected 'current' symlink not to be created when NVM_SYMLINK_CURRENT=1!"
+registerExpectedNoSymlink $?
+
+unset NVM_SYMLINK_CURRENT
+cleanup
+runNvmUse
+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_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_checksum
+++ b/tests/nvm_checksum
@@ -0,0 +1,18 @@
+#!/bin/sh
+
+cleanup () {
+  rm tmp/emptyfile tmp/testfile
+  rmdir tmp
+}
+die () { echo $@ ; cleanup; exit 1; }
+
+. ../../../nvm.sh
+
+mkdir -p tmp
+touch tmp/emptyfile
+echo -n "test" > tmp/testfile
+
+nvm_checksum tmp/emptyfile "da39a3ee5e6b4b0d3255bfef95601890afd80709" || die "nvm_checksum on an empty file did not match the SHA1 digest of the empty string"
+nvm_checksum tmp/testfile "da39a3ee5e6b4b0d3255bfef95601890afd80709" && die "nvm_checksum allowed a bad checksum"
+
+cleanup
--- 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/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_ls_current
+++ b/tests/nvm_ls_current
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+die () { echo $@ ; 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"'
+
+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"
+
+[ "$(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'
+
+echo "#!/bin/bash" > "$TEST_DIR/node"
+echo "echo 'VERSION FOO!'" > "$TEST_DIR/node"
+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"
+
--- 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_num_version_groups
+++ b/tests/nvm_num_version_groups
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "~$(nvm_num_version_groups)" = "~0" ] || die "no args 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 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 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' and 'unstable' are supported."
+[ "_$(nvm_print_implicit_alias local 2>&1)" = "_$EXPECTED_SECOND_MSG" ] \
+  || die "nvm_print_implicit_alias did not require stable|unstable as second argument"
+[ "_$(nvm_print_implicit_alias local foo 2>&1)" = "_$EXPECTED_SECOND_MSG" ] \
+  || die "nvm_print_implicit_alias did not require stable|unstable 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 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,47 @@
+#!/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
+  unset -f nvm_ls_remote
+}
+
+. ../../../nvm.sh
+
+mkdir ../../../v0.2.3
+mkdir ../../../v0.3.4
+mkdir ../../../v0.4.6
+mkdir ../../../v0.5.7
+mkdir ../../../v0.7.7
+
+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_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"
+
+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"
+}
+
+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_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"
+
+cleanup
+
--- a/tests/nvm_remote_version
+++ b/tests/nvm_remote_version
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+die () { echo $@ ; cleanup ; exit 1; }
+
+cleanup() {
+  unset -f nvm_ls_remote
+}
+
+. ../../../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() {
+  echo "test output"
+  echo "more test output"
+  echo "pattern received: _$1_"
+}
+
+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"
+
+cleanup
+
--- a/tests/nvm_tree_contains_path
+++ b/tests/nvm_tree_contains_path
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+cleanup () {
+  rm tmp/node
+  rmdir tmp
+  rm tmp2/node
+  rmdir tmp2
+}
+die () { echo $@ ; cleanup; exit 1; }
+
+. ../../../nvm.sh
+
+mkdir -p tmp
+touch tmp/node
+mkdir -p tmp2
+touch tmp2/node
+
+[ "$(nvm_tree_contains_path 2>&1)" = "both the tree and the node path are required" ] || die 'incorrect error message with no args'
+[ "$(nvm_tree_contains_path > /dev/null 2>&1 ; echo $?)" = "2" ] || die 'incorrect error code with no args'
+[ "$(nvm_tree_contains_path tmp 2>&1)" = "both the tree and the node path are required" ] || die 'incorrect error message with one arg'
+[ "$(nvm_tree_contains_path > /dev/null 2>&1 ; echo $?)" = "2" ] || die 'incorrect error code with one arg'
+
+nvm_tree_contains_path tmp tmp/node || die '"tmp" should contain "tmp/node"'
+
+nvm_tree_contains_path tmp tmp2/node && die '"tmp" should not contain "tmp2/node"'
+
+nvm_tree_contains_path tmp2 tmp2/node || die '"tmp2" should contain "tmp2/node"'
+
+nvm_tree_contains_path tmp2 tmp/node && die '"tmp2" should not contain "tmp/node"'
+
+cleanup
+
--- a/tests/nvm_validate_implicit_alias
+++ b/tests/nvm_validate_implicit_alias
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+EXPECTED_MSG="Only implicit aliases 'stable' and 'unstable' are supported."
+[ "_$(nvm_validate_implicit_alias 2>&1)" = "_$EXPECTED_MSG" ] \
+  || die "nvm_validate_implicit_alias did not require stable|unstable"
+[ "_$(nvm_validate_implicit_alias foo 2>&1)" = "_$EXPECTED_MSG" ] \
+  || die "nvm_validate_implicit_alias did not require stable|unstable"
+
+EXIT_CODE="$(nvm_validate_implicit_alias >/dev/null 2>&1 ; echo $?)"
+[ "_$EXIT_CODE" = "_1" ] \
+  || die "nvm_validate_implicit_alias without stable|unstable 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"
+
--- a/tests/nvm_version_dir
+++ b/tests/nvm_version_dir
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+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 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_greater
+++ b/tests/nvm_version_greater
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm_version_greater 0.10.0 0.2.12 || die '"nvm_version_greater 0.10.0 0.2.12" did not return true'
+
+if nvm_version_greater 0.10.0 0.20.12; then
+  die '"nvm_version_greater 0.10.0 0.20.12" returned true'
+fi
+
+if nvm_version_greater 0.10.0 0.10.0; then
+  die '"nvm_version_greater" returned false for the same two versions'
+fi
+
--- a/tests/nvm_version_path
+++ b/tests/nvm_version_path
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+[ "$(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'
+
--- a/test/fast/setup_dir
+++ b/test/fast/setup_dir
@@ -9,5 +9,8 @@
  for SRC in v* src alias; do
    [ -e "$SRC" ] && mv "$SRC" bak
  done
+  if [ -d versions ]; then
+    mv versions bak
+  fi
  true
 )
--- 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
+
+# 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/installation/install
+++ b/test/installation/install
@@ -2,13 +2,13 @@

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

-. ../../../nvm.sh
+. ../../nvm.sh

 [ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message"

 # Remove the stuff we're clobbering.
-[ -e ../../../v0.9.7 ] && rm -R ../../../v0.9.7
-[ -e ../../../v0.9.12 ] && rm -R ../../../v0.9.12
+[ -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
--- a/test/installation/install
+++ b/test/installation/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/install
+++ b/test/installation/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/install
+++ b/test/installation/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/install
+++ b/test/installation/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/install
+++ b/test/installation/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/install
+++ b/test/installation/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 --copy-packages-from=0.9 || die "nvm install 0.9.12 --copy-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/setup_dir
+++ b/test/installation/setup_dir
--- a/test/installation/teardown_dir
+++ b/test/installation/teardown_dir
@@ -1,6 +1,7 @@
 #!/bin/sh

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

 if [ -f ".nvmrc" ]; then
--- a/test/slow/Running
+++ b/test/slow/Running
@@ -8,3 +8,7 @@ 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/copy-packages/Running
+++ b/copy-packages/Running
@@ -0,0 +1,16 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm use 0.10.28 > /dev/null
+
+EXPECTED_MSG="Can not copy packages from the current version of node."
+ACTUAL_MSG="$(nvm copy-packages 0.10.28 2>&1 > /dev/null)"
+[ "~$ACTUAL_MSG" = "~$EXPECTED_MSG" ] || die "'nvm use 0.10.28 && nvm copy-packages 0.10.28' did not fail with the right message: '$ACTUAL_MESSAGE'"
+
+EXPECTED_ERROR_CODE="2"
+ACTUAL_ERROR_CODE="$(nvm copy-packages 0.10.28  > /dev/null 2>&1 ; echo $?)"
+[ "~$ACTUAL_ERROR_CODE" = "~$EXPECTED_ERROR_CODE" ] || die "'nvm use 0.10.28 && nvm copy-packages 0.10.28' did not fail with the right error code: expected '$EXPECTED_ERROR_CODE', got '$ACTUAL_ERROR_CODE'"
+
--- a/copy-packages/setup_dir
+++ b/copy-packages/setup_dir
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+nvm install 0.10.28
+nvm install 0.10.29
+
+if [ -f ".nvmrc" ]; then
+  mv .nvmrc .nvmrc.bak
+fi
+
--- a/copy-packages/should
+++ b/copy-packages/should
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+die () { echo "$@" ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm use 0.10.28
+
+EXPECTED_PACKAGES="autoprefixer bower david eslint grunt-cli grunth-cli http-server jshint marked node-gyp recursive-blame uglify-js yo"
+
+echo "$EXPECTED_PACKAGES" | xargs npm install -g --quiet
+
+nvm use 0.10.29
+ORIGINAL_PACKAGES=$(npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | sort | uniq | xargs)
+
+nvm copy-packages 0.10.28
+FINAL_PACKAGES=$(npm list -g --depth=0 | tail -n +2 | \grep -o -e ' [^@]*' | cut -c 2- | \grep -v npm | sort | uniq | xargs)
+
+[ "$FINAL_PACKAGES" = "$EXPECTED_PACKAGES" ] || die "final packages ($FINAL_PACKAGES) did not match expected packages ($EXPECTED_PACKAGES)"
+[ "$ORIGINAL_PACKAGES" != "$FINAL_PACKAGES" ] || die "original packages matched final packages ($ORIGINAL_PACKAGES)"
+
--- a/copy-packages/teardown_dir
+++ b/copy-packages/teardown_dir
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+nvm uninstall v0.10.28
+nvm uninstall v0.10.29
+
+rm -f .nvmrc
+
+if [ -f ".nvmrc.bak" ]; then
+  mv .nvmrc.bak .nvmrc
+fi
+
--- a/test/slow/nvm
+++ b/test/slow/nvm
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm use 0.10
+NPM_VERSION_TEN="$(npm --version)"
+
+nvm use 0.11.7 && [ "$(node --version)" = "v0.11.7" ] || die "\`nvm use\` failed!"
+
+[ "$(nvm exec 0.10 npm --version | tail -1)" = "$NPM_VERSION_TEN" ] || die "`nvm exec` failed to run with the correct version"
+
--- a/test/slow/nvm
+++ b/test/slow/nvm
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+. ../../../nvm.sh
+
+nvm use 0.10.7
+NPM_VERSION_TEN="$(npm --version)"
+
+nvm use 0.11.7 && [ "$(node --version)" = "v0.11.7" ] || die "\`nvm use\` failed!"
+
+echo "0.10.7" > .nvmrc
+
+[ "$(nvm exec npm --version | tail -1)" = "$NPM_VERSION_TEN" ] || die "\`nvm exec\` failed to run with the .nvmrc version"
+
+[ "$(nvm exec npm --version | head -1)" = "Found '$PWD/.nvmrc' with version <0.10.7>" ] || die "\`nvm exec\` failed to print out the \"found in .nvmrc\" message"
+
--- a/exec/setup_dir
+++ b/exec/setup_dir
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+nvm install 0.10.7
+nvm install 0.11.7
+
+if [ -f ".nvmrc" ]; then
+  mv .nvmrc .nvmrc.bak
+fi
+
--- a/exec/teardown_dir
+++ b/exec/teardown_dir
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. ../../../nvm.sh
+nvm deactivate
+nvm uninstall v0.10.7
+nvm uninstall v0.11.7
+
+rm .nvmrc
+
+if [ -f ".nvmrc.bak" ]; then
+  mv .nvmrc.bak .nvmrc
+fi
+
--- a/install/install
+++ b/install/install
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-. ../../../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
-
-# Check
-[ -d ../../../$NVM_TEST_VERSION ]
-nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
-
--- a/install/install
+++ b/install/install
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-set -e
-. ../../../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
-
-# Check
-[ -d ../../../$NVM_TEST_VERSION ]
-nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
-
--- a/install/install
+++ b/install/install
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-set -e
-. ../../../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
-nvm i 0.9.12
-
-# Check
-[ -d ../../../v0.9.7 ]
-[ -d ../../../v0.9.12 ]
-
-# Use the first one
-nvm use 0.9.7
-
-# Use the latest one
-nvm use 0.9
-node --version | grep v0.9.12
-
--- a/install/install
+++ b/install/install
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-. ../../../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
-cat "$NVM_TEST_VERSION" > .nvmrc
-
-nvm install
-
-# Check
-[ -d ../../../$NVM_TEST_VERSION ]
-nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
-
-
--- a/install/install
+++ b/install/install
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-. ../../../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
-cat "$NVM_TEST_VERSION" > .nvmrc
-
-nvm install -s
-
-# Check
-[ -d ../../../$NVM_TEST_VERSION ]
-nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION
-
-
--- a/run/teardown_dir
+++ b/run/teardown_dir
@@ -1,6 +1,7 @@
 #!/bin/sh

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

 rm .nvmrc
--- a/test/sourcing/Sourcing
+++ b/test/sourcing/Sourcing
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+echo '0.10.1' > ../../alias/default || die 'creation of default alias failed'
+
+. ../../nvm.sh || die 'sourcing returned nonzero exit code'
+
+NVM_LS_CURRENT="$(nvm ls current | \grep -o v0.10.1)"
+[ "_$NVM_LS_CURRENT" = '_v0.10.1' ] || die "'nvm ls current' did not return '-> v0.10.1', got '$NVM_LS_CURRENT'"
+
+# NVM_LS_CURRENT_COLORED="$(nvm ls current | sed -n l)"
+
+NVM_ALIAS_DEFAULT="$(nvm alias default)"
+[ "_$NVM_ALIAS_DEFAULT" = "_default -> 0.10.1 (-> v0.10.1)" ] \
+  || die "'nvm alias default did not return 'default -> 0.10.1 (-> v0.10.1)', got '$NVM_ALIAS_DEFAULT'"
+
--- a/test/sourcing/setup
+++ b/test/sourcing/setup
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+mkdir -p ../../alias
+rm -f ../../.nvmrc
+rm -rf ../../v0.10.7
+rm -rf ../../v0.9.7
+rm -rf ../../v0.9.12
+
+. ../../nvm.sh
+nvm install 0.10.1 || echo >&2 'nvm install 0.10.1 failed'
+nvm unload || echo >&2 'nvm unload failed'
+
--- a/test/sourcing/teardown
+++ b/test/sourcing/teardown
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+rm -rf ../../alias
+rm -rf ../../v0.10.1
+rm -rf ../../v0.10.2
+rm -f ../../.nvmrc
+