v0.24.2

Fixes #721

.gitattributes

@@ -1 +0,0 @@
-*.sh eol=lf

.travis.yml

@@ -10,7 +10,11 @@ install:
 script:
   - NVM_DIR=$TRAVIS_BUILD_DIR make TEST_SUITE=$TEST_SUITE URCHIN=/tmp/urchin/package/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

README.markdown

@@ -4,22 +4,23 @@
 
 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 neither supported nor developed by us:
+Note: `nvm` does not support Windows (see [#284](https://github.com/creationix/nvm/issues/284)). Two alternatives exist, which are not supported nor developed by us:
  - [nvmw](https://github.com/hakobera/nvmw)
  - [nvm-windows](https://github.com/coreybutler/nvm-windows)
 
-Note: `nvm` does not support [Fish] either (see [#303](https://github.com/creationix/nvm/issues/303)). An alternative exists, which is neither supported nor developed by us:
- - [bass](https://github.com/edc/bass) allows to use utilities written for Bash in fish shell
+Note: `nvm` does not support [Fish] either (see [#303](https://github.com/creationix/nvm/issues/303)). Two alternatives exist, which are not supported nor developed by us:
+ - [nvm-fish-wrapper](https://github.com/passcod/nvm-fish-wrapper)
+ - [nvm-fish](https://github.com/Alex7Kom/nvm-fish) (does not support iojs)
 
 ### Install script
 
 To install you could use the [install script][2] using cURL:
 
-    curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.27.0/install.sh | bash
+    curl https://raw.githubusercontent.com/creationix/nvm/v0.24.2/install.sh | bash
 
 or Wget:
 
-    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.27.0/install.sh | bash
+    wget -qO- https://raw.githubusercontent.com/creationix/nvm/v0.24.2/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>
 
@@ -38,7 +39,7 @@ Or if you have `git` installed, then just clone it, and check out the latest ver
 
 To activate nvm, you need to source it from your shell:
 
-    . ~/.nvm/nvm.sh
+    source ~/.nvm/nvm.sh
 
 I always add this line to my `~/.bashrc`, `~/.profile`, or `~/.zshrc` file to have it automatically sourced upon login.
 Often I also put in a line to use a specific version of node.
@@ -75,27 +76,10 @@ In place of a version pointer like "0.10", you can use the special default alias
     nvm use stable
     nvm run unstable --version
 
-If you want to install a new version of Node.js and migrate npm packages from a previous version:
-
-    nvm install node --reinstall-packages-from=node
-
-This will first use "nvm version node" to identify the current version you're migrating packages from. Then it resolves the new version to install from the remote server and installs it. Lastly, it runs "nvm reinstall-packages" to reinstall the npm packages from your prior version of Node to the new one.
-
-You can also install and migrate npm packages from specific versions of Node like this:
-
-    nvm install v0.10.40 --reinstall-packages-from=0.10.39
-    nvm install v0.12.7 --reinstall-packages-from=0.12.6
-
 If you want to install [io.js](https://github.com/iojs/io.js/):
 
     nvm install iojs
 
-If you want to install a new version of io.js and migrate npm packages from a previous version:
-
-    nvm install iojs --reinstall-packages-from=iojs
-
-The same guidelines mentioned for migrating npm packages in Node.js are applicable to io.js.
-
 If you want to use the system-installed version of node, you can use the special default alias "system":
 
     nvm use system
@@ -203,20 +187,6 @@ nvm uninstall
 	$ nvm uninstall [tab][tab]
 	my_alias        default        v0.6.21        v0.8.26       v0.10.28
 
-## Compatibility Issues
-`nvm` will encounter some issues if you have some non-default settings set. (see [#606](/../../issues/606))
-The following are known to cause issues:
-
-Inside `~/.npmrc`
-```
-prefix='some/path'
-```
-Environment Variables:
-```
-$NPM_CONFIG_PREFIX
-$PREFIX
-```
-
 ## Problems
 
 If you try to install a node version and the installation fails, be sure to delete the node downloads from src (~/.nvm/src/) or you might get an error when trying to reinstall them again or you might get an error like the following:
@@ -236,7 +206,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.27.0/install.sh
+[2]: https://github.com/creationix/nvm/blob/v0.24.2/install.sh
 [3]: https://travis-ci.org/creationix/nvm
 [Urchin]: https://github.com/scraperwiki/urchin
 [Fish]: http://fishshell.com

bash_completion

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

install.sh

@@ -2,8 +2,6 @@
 
 set -e
 
-{ # this ensures the entire script is downloaded #
-
 nvm_has() {
   type "$1" > /dev/null 2>&1
 }
@@ -13,7 +11,7 @@ if [ -z "$NVM_DIR" ]; then
 fi
 
 nvm_latest_version() {
-  echo "v0.27.0"
+  echo "v0.24.2"
 }
 
 #
@@ -44,7 +42,7 @@ nvm_source() {
 
 nvm_download() {
   if nvm_has "curl"; then
-    curl -q $*
+    curl $*
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(echo "$*" | command sed -e 's/--progress-bar /--progress=bar /' \
@@ -73,12 +71,7 @@ install_nvm_from_git() {
   fi
   cd "$NVM_DIR" && command git checkout --quiet $(nvm_latest_version)
   if [ ! -z "$(cd "$NVM_DIR" && git show-ref refs/heads/master)" ]; then
-    if git branch --quiet 2>/dev/null; then
     cd "$NVM_DIR" && command git branch --quiet -D master >/dev/null 2>&1
-    else
-      echo >&2 "Your version of git is out of date. Please update it!"
-      cd "$NVM_DIR" && command git branch -D master >/dev/null 2>&1
-    fi
   fi
   return
 }
@@ -117,38 +110,16 @@ install_nvm_as_script() {
 # Otherwise, an empty string is returned
 #
 nvm_detect_profile() {
-
-  local DETECTED_PROFILE
-  DETECTED_PROFILE=''
-  local SHELLTYPE
-  SHELLTYPE="$(basename /$SHELL)"
-
-  if [ $SHELLTYPE = "bash" ]; then
-    if [ -f "$HOME/.bashrc" ]; then
-      DETECTED_PROFILE="$HOME/.bashrc"
-    elif [ -f "$HOME/.bash_profile" ]; then
-      DETECTED_PROFILE="$HOME/.bash_profile"
-    fi
-  elif [ $SHELLTYPE = "zsh" ]; then
-    DETECTED_PROFILE="$HOME/.zshrc"
-  fi
-
-  if [ -z $DETECTED_PROFILE ]; then
   if [ -f "$PROFILE" ]; then
-      DETECTED_PROFILE="$PROFILE"
-    elif [ -f "$HOME/.profile" ]; then
-      DETECTED_PROFILE="$HOME/.profile"
+    echo "$PROFILE"
   elif [ -f "$HOME/.bashrc" ]; then
-      DETECTED_PROFILE="$HOME/.bashrc"
+    echo "$HOME/.bashrc"
   elif [ -f "$HOME/.bash_profile" ]; then
-      DETECTED_PROFILE="$HOME/.bash_profile"
+    echo "$HOME/.bash_profile"
   elif [ -f "$HOME/.zshrc" ]; then
-      DETECTED_PROFILE="$HOME/.zshrc"
-    fi
-  fi
-
-  if [ ! -z $DETECTED_PROFILE ]; then
-    echo "$DETECTED_PROFILE"
+    echo "$HOME/.zshrc"
+  elif [ -f "$HOME/.profile" ]; then
+    echo "$HOME/.profile"
   fi
 }
 
@@ -240,7 +211,7 @@ nvm_do_install() {
     printf "$SOURCE_STR"
     echo
   else
-    if ! command grep -qc '/nvm.sh' "$NVM_PROFILE"; then
+    if ! grep -qc 'nvm.sh' "$NVM_PROFILE"; then
       echo "=> Appending source string to $NVM_PROFILE"
       printf "$SOURCE_STR\n" >> "$NVM_PROFILE"
     else
@@ -265,5 +236,3 @@ nvm_reset() {
 }
 
 [ "_$NVM_ENV" = "_testing" ] || nvm_do_install
-
-} # this ensures the entire script is downloaded #

nvm-exec

@@ -11,3 +11,4 @@ else
 fi
 
 exec $@
+

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.27.0",
+  "version": "0.24.2",
   "description": "Node Version Manager - Simple bash script to manage multiple active node.js versions",
   "directories": {
     "test": "test"
@@ -30,8 +30,8 @@
   },
   "homepage": "https://github.com/creationix/nvm",
   "devDependencies": {
-    "replace": "^0.3.0",
-    "semver": "^5.0.1",
-    "urchin": "^0.0.5"
+    "replace": "~0.3.0",
+    "semver": "~4.2.0",
+    "urchin": "~0.0.5"
   }
 }

test/fast/Aliases/nvm_ensure_default_set

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-die () { echo $@ ; exit 1; }
-
-. ../../../nvm.sh
-
-nvm alias default 0.1 >/dev/null || die "'nvm alias default 0.1' failed"
-
-nvm_ensure_default_set 0.3 || die "'nvm_ensure_default_set' with an existing default alias exits 0"
-
-nvm unalias default || die "'nvm unalias default' failed"
-
-OUTPUT="$(nvm_ensure_default_set 0.2)"
-EXPECTED_OUTPUT="Creating default alias: default -> 0.2 (-> iojs-v0.2.10)"
-EXIT_CODE="$?"
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set 0.2' did not output '$EXPECTED_OUTPUT', got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_0" ] || die "'nvm_ensure_default_set 0.2' did not exit with 0, got $EXIT_CODE"

test/fast/Aliases/teardown

@@ -14,4 +14,3 @@ rm -f "../../../alias/stable"
 rm -f "../../../alias/unstable"
 rm -f "../../../alias/node"
 rm -f "../../../alias/iojs"
-rm -f "../../../alias/default"

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

@@ -7,7 +7,7 @@ die () { echo $@ ; exit 1; }
 [ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2
 
 . ../../nvm.sh
-nvm use --delete-prefix v0.2.3 || die "Failed to activate v0.2.3"
+nvm use v0.2.3 || die "Failed to activate v0.2.3"
 [ `expr "$PATH" : ".*v0.2.3/.*/bin"` != 0 ] || die "PATH not set up properly"
 [ `expr "$NODE_PATH" : ".*v0.2.3/.*/lib/node_modules"` = 0 ] || die "NODE_PATH should not contain (npm root -g)"
 # ^ note: NODE_PATH should not contain `npm root -g` since globals should not be requireable

test/fast/Running "nvm use foo" where "foo" is circular aborts

@@ -18,13 +18,5 @@ EXPECTED_OUTPUT='The alias "foo" leads to an infinite loop. Aborting.'
 EXIT_CODE="$(nvm use foo 2>/dev/null ; echo $?)"
 [ "_$EXIT_CODE" = "_8" ] || die "Expected exit code 8; got $EXIT_CODE"
 
-OUTPUT="$(nvm use --silent foo 2>&1)"
-EXPECTED_OUTPUT=''
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use --silent foo' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-
-EXIT_CODE="$(nvm use --silent foo 2>/dev/null ; echo $?)"
-[ "_$EXIT_CODE" = "_8" ] || die "Expected exit code 8 from 'nvm use --silent foo'; got $EXIT_CODE"
-
 cleanup;
 

test/fast/Running "nvm use iojs" uses latest io.js version

@@ -18,21 +18,5 @@ EXPECTED_OUTPUT='The alias "foo" leads to an infinite loop. Aborting.'
 EXIT_CODE="$(nvm use foo 2>/dev/null ; echo $?)"
 [ "_$EXIT_CODE" = "_8" ] || die "Expected exit code 8; got $EXIT_CODE"
 
-OUTPUT="$(nvm use --silent foo 2>&1)"
-EXPECTED_OUTPUT=''
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use --silent foo' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-
-OUTPUT="$(nvm use foo --silent 2>&1)"
-EXPECTED_OUTPUT=''
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use foo --silent' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-
-EXIT_CODE="$(nvm use --silent foo 2>/dev/null ; echo $?)"
-[ "_$EXIT_CODE" = "_8" ] || die "Expected exit code 8 from 'nvm use --silent foo'; got $EXIT_CODE"
-
-EXIT_CODE="$(nvm use foo --silent 2>/dev/null ; echo $?)"
-[ "_$EXIT_CODE" = "_8" ] || die "Expected exit code 8 from 'nvm use foo --silent'; got $EXIT_CODE"
-
 cleanup;
 

test/fast/Running "nvm use system" should work as expected

@@ -5,18 +5,9 @@ die () { echo $@ ; exit 1; }
 . ../../nvm.sh
 
 nvm_has_system_node() { return 0; }
-nvm_print_npm_version() { return ' (npm v1.2.3)'; }
-EXPECTED_OUTPUT="Now using system version of node: $(node -v)$(nvm_print_npm_version)"
-[ "$(nvm use system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Could not use system version of node"
-EXPECTED_OUTPUT=""
-[ "$(nvm use --silent system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Could not use system version of node or --silent was not silent"
+[ "$(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_print_npm_version() { return ''; }
-EXPECTED_OUTPUT="System version of node not found."
-[ "$(nvm use system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Did not report error, system node not found"
+[ "$(nvm use system 2>&1 | 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"
-EXPECTED_OUTPUT=""
-[ "$(nvm use --silent system 2>&1 | tail -n1)" = "$EXPECTED_OUTPUT" ] || die "Did not report error, system node not found or --silent was not silent"
-nvm use --silent system 2>&1 > /dev/null || [ $? -eq 127 ] || die "Did not return error code, system node not found or --silent was not silent"
 

test/fast/Unit tests/nvm_die_on_prefix

@@ -1,74 +0,0 @@
-#!/bin/sh
-
-cleanup () {
-  alias nvm_has='\nvm_has'
-  alias npm='\npm'
-  unset -f nvm_has npm
-}
-die () { echo $@ ; exit 1; }
-
-. ../../../nvm.sh
-
-OUTPUT="$(nvm_die_on_prefix 2>&1)"
-EXPECTED_OUTPUT="First argument \"delete the prefix\" must be zero or one"
-EXIT_CODE="$(nvm_die_on_prefix >/dev/null 2>&1; echo $?)"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_die_on_prefix' did not error with '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_1" ] || die "'nvm_die_on_prefix' did not exit with 1; got "$EXIT_CODE""
-
-OUTPUT="$(nvm_die_on_prefix 2 2>&1)"
-EXPECTED_OUTPUT="First argument \"delete the prefix\" must be zero or one"
-EXIT_CODE="$(nvm_die_on_prefix 2 >/dev/null 2>&1; echo $?)"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_die_on_prefix 2' did not error with '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_1" ] || die "'nvm_die_on_prefix' did not exit with 1; got "$EXIT_CODE""
-
-OUTPUT="$(nvm_die_on_prefix 0 2>&1)"
-EXPECTED_OUTPUT="Second argument \"nvm command\" must be nonempty"
-EXIT_CODE="$(nvm_die_on_prefix 0 >/dev/null 2>&1; echo $?)"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_die_on_prefix 0' did not error with '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_2" ] || die "'nvm_die_on_prefix 0' did not exit with 2; got '$EXIT_CODE'"
-
-nvm_has() { return 1; } # ie, npm is not installed
-OUTPUT="$(nvm_die_on_prefix 0 foo 2>&1)"
-[ -z "$OUTPUT" ] || die "nvm_die_on_prefix was not a noop when nvm_has returns 1, got '$OUTPUT'"
-
-nvm_has() { return 0; }
-
-npm() {
-  local args
-  args="$@"
-  if [ "_$args" = "_config get prefix" ]; then
-    echo "$(nvm_version_dir new)/good prefix"
-  fi
-}
-OUTPUT="$(nvm_die_on_prefix 0 foo 2>&1)"
-[ -z "$OUTPUT" ] || die "'nvm_die_on_prefix' was not a noop when prefix is good; got '$OUTPUT'"
-
-OUTPUT="$(PREFIX=bar nvm_die_on_prefix 0 foo 2>&1)"
-EXPECTED_OUTPUT='nvm is not compatible with the "PREFIX" environment variable: currently set to "bar"
-Run `unset PREFIX` to unset it.'
-EXIT_CODE="$(PREFIX=bar nvm_die_on_prefix 0 foo >/dev/null 2>&1; echo $?)"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'PREFIX=bar nvm_die_on_prefix 0 foo' did not error with '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_3" ] || die "'PREFIX=bar nvm_die_on_prefix 0 foo' did not exit with 3; got '$EXIT_CODE'"
-
-OUTPUT="$(NPM_CONFIG_PREFIX=bar nvm_die_on_prefix 0 foo 2>&1)"
-EXPECTED_OUTPUT='nvm is not compatible with the "NPM_CONFIG_PREFIX" environment variable: currently set to "bar"
-Run `unset NPM_CONFIG_PREFIX` to unset it.'
-EXIT_CODE="$(NPM_CONFIG_PREFIX=bar nvm_die_on_prefix 0 foo >/dev/null 2>&1; echo $?)"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'NPM_CONFIG_PREFIX=bar nvm_die_on_prefix 0 foo' did not error with '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_4" ] || die "'NPM_CONFIG_PREFIX=bar nvm_die_on_prefix 0 foo' did not exit with 4; got '$EXIT_CODE'"
-
-npm() {
-  local args
-  args="$@"
-  if [ "_$args" = "_config get prefix" ]; then
-    echo "./bad prefix"
-  fi
-}
-OUTPUT="$(nvm_die_on_prefix 0 foo 2>&1)"
-EXPECTED_OUTPUT="nvm is not compatible with the npm config \"prefix\" option: currently set to \"./bad prefix\"
-Run \`npm config delete prefix\` or \`foo\` to unset it."
-EXIT_CODE="$(nvm_die_on_prefix 0 foo >/dev/null 2>&1; echo $?)"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_die_on_prefix 0 foo' did not error with '$EXPECTED_OUTPUT' with bad prefix set; got '$OUTPUT'"
-[ "_$EXIT_CODE" = "_10" ] || die "'nvm_die_on_prefix 0 foo' did not exit with 10 with bad prefix set; got '$EXIT_CODE'"
-
-cleanup

test/fast/Unit tests/nvm_ensure_default_set

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-die () { echo $@ ; exit 1; }
-
-. ../../../nvm.sh
-
-EXPECTED_OUTPUT="nvm_ensure_default_set: a version is required"
-OUTPUT="$(nvm_ensure_default_set 2>&1 >/dev/null)"
-EXIT_CODE="$?"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_ensure_default_set' did not output "$EXPECTED_OUTPUT", got "$OUTPUT""
-[ "_$EXIT_CODE" = "_1" ] || die "'nvm_ensure_default_set' did not exit with 1, got "$EXIT_CODE""
-
-# see test/fast/Aliases for remaining nvm_ensure_default_set tests

test/fast/Unit tests/nvm_ensure_version_installed

@@ -20,11 +20,4 @@ EXIT_CODE=$?
 [ "_$OUTPUT" = "_" ] || die "expected 'nvm_ensure_version_installed 0.1' to have no output, got $OUTPUT"
 [ "_$EXIT_CODE" = "_0" ] || die "expected 'nvm_ensure_version_installed 0.1' to exit with 0, got $EXIT_CODE"
 
-# Special case for "iojs"
-OUTPUT="$(nvm_ensure_version_installed iojs 2>&1)"
-EXIT_CODE=$?
-EXPECTED_OUTPUT='N/A: version "iojs" is not yet installed'
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "expected 'nvm_ensure_version_installed iojs' to give $EXPECTED_OUTPUT, got $OUTPUT"
-[ "_$EXIT_CODE" = "_1" ] || die "expected 'nvm_ensure_version_installed iojs' to exit with 1, got $EXIT_CODE"
-
 cleanup

test/fast/Unit tests/nvm_is_merged_node_version

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-die () { echo $@ ; exit 1; }
-
-. ../../../nvm.sh
-
-nvm_is_merged_node_version '4.0' || die '"nvm_is_merged_node_version 4.0 was not true'
-nvm_is_merged_node_version '5.1' || die '"nvm_is_merged_node_version 5.1 was not true'
-! nvm_is_merged_node_version '3.99' || die '"nvm_is_merged_node_version 3.99 was not false'
-! nvm_is_merged_node_version 'v1.0.0' || die '"nvm_is_merged_node_version v1.0.0" was not false'

test/fast/Unit tests/nvm_num_version_groups

@@ -5,17 +5,13 @@ die () { echo $@ ; exit 1; }
 . ../../../nvm.sh
 
 [ "~$(nvm_num_version_groups)" = "~0" ] || die "no args should give 0"
-[ "~$(nvm_num_version_groups v)" = "~0" ] || die "just "v" should give 0"
-[ "~$(nvm_num_version_groups .)" = "~0" ] || die "just "." should give 0"
 [ "~$(nvm_num_version_groups a)" = "~1" ] || die "one letter should give 1"
 
 [ "~$(nvm_num_version_groups 1)" = "~1" ] || die "1 should give 1"
-[ "~$(nvm_num_version_groups 1.)" = "~1" ] || die "1. should give 1"
 [ "~$(nvm_num_version_groups v1)" = "~1" ] || die "v1 should give 1"
 [ "~$(nvm_num_version_groups v1.)" = "~1" ] || die "v1. should give 1"
 
 [ "~$(nvm_num_version_groups 1.2)" = "~2" ] || die "1.2 should give 2"
-[ "~$(nvm_num_version_groups 1.2.)" = "~2" ] || die "1.2. should give 2"
 [ "~$(nvm_num_version_groups v1.2)" = "~2" ] || die "v1.2 should give 2"
 [ "~$(nvm_num_version_groups v1.2.)" = "~2" ] || die "v1.2. should give 2"
 

test/fast/Unit tests/nvm_print_implicit_alias success

@@ -8,8 +8,6 @@ cleanup() {
   rm -rf ../../../v0.5.7
   rm -rf ../../../v0.7.7
   rm -rf ../../../versions/io.js/v0.98.0
-  rm -rf ../../../versions/node/v1.0.0
-  rm -rf ../../../versions/node/v1.1.0
   unset -f nvm_ls_remote nvm_ls_remote_iojs
 }
 
@@ -34,17 +32,6 @@ LATEST_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
 LATEST_IOJS="$(nvm_print_implicit_alias local iojs)"
 [ "_$LATEST_IOJS" = "_iojs-v0.98" ] || die "local iojs is not latest iojs: expected iojs-v0.98, got $LATEST_IOJS"
 
-## node post v1.0/io.js merger ##
-mkdir -p ../../../versions/node/v1.0.0
-mkdir -p ../../../versions/node/v1.1.0
-
-LATEST_STABLE="$(nvm_print_implicit_alias local stable)"
-[ "_$LATEST_STABLE" = "_1.1" ] || die "local stable when post-v1.0 exists is not latest: expected 1.1, got $LATEST_STABLE"
-
-LATEST_UNSTABLE="$(nvm_print_implicit_alias local unstable)"
-[ "_$LATEST_UNSTABLE" = "_0.7" ] || die "local unstable is not latest pre-v1.0 odd minor: expected 0.7, got $LATEST_UNSTABLE"
-## ** ##
-
 nvm_ls_remote() {
   echo "v0.4.3"
   echo "v0.5.4"
@@ -78,28 +65,5 @@ LATEST_UNSTABLE="$(nvm_print_implicit_alias remote unstable)"
 LATEST_IOJS="$(nvm_print_implicit_alias remote iojs)"
 [ "_$LATEST_IOJS" = "_iojs-v0.99" ] || die "remote iojs is not latest: expected iojs-v0.99, got $LATEST_IOJS"
 
-## node post v1.0/io.js merger ##
-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"
-  echo "v1.0.0"
-  echo "v1.1.0"
-}
-
-LATEST_STABLE="$(nvm_print_implicit_alias remote stable)"
-[ "_$LATEST_STABLE" = "_1.1" ] || die "remote stable when post-v1.0 exists is not latest: expected 1.1, got $LATEST_STABLE"
-
-LATEST_UNSTABLE="$(nvm_print_implicit_alias remote unstable)"
-[ "_$LATEST_UNSTABLE" = "_0.9" ] || die "remote unstable is not latest odd pre-v1.0 minor: expected 0.9, got $LATEST_UNSTABLE"
-## ** ##
-
 cleanup
 

test/fast/Unit tests/nvm_print_npm_version

@@ -1,28 +0,0 @@
-#!/bin/sh
-
-cleanup () {
-  alias nvm_has='\nvm_has'
-  alias npm='\npm'
-  unset -f nvm_has npm
-}
-die () { echo $@ ; exit 1; }
-
-. ../../../nvm.sh
-
-nvm_has() { return 1; }
-OUTPUT="$(nvm_print_npm_version)"
-[ -z "$OUTPUT" ] || die "nvm_print_npm_version did not return empty when nvm_has returns 1, got '$OUTPUT'"
-
-nvm_has() { return 0; }
-npm() {
-  if [ "_$@" = "_--version" ]; then
-    echo "1.2.3"
-  else
-    echo "error"
-  fi
-}
-OUTPUT="$(nvm_print_npm_version)"
-EXPECTED_OUTPUT=" (npm v1.2.3)"
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_print_npm_version did not provided '$EXPECTED_OUTPUT', got '$OUTPUT'"
-
-cleanup

test/install_script/nvm_detect_profile

@@ -22,80 +22,46 @@ HOME="."
 
 setup
 
-#Let's force $SHELL to be bash
-SHELL="/bin/bash"
-
-# $SHELL is set to bash and .bashrc is there, it must be detected
-_PROFILE=$(nvm_detect_profile)
-[ "_$_PROFILE" = "_$HOME/.bashrc" ] || echo "_\$HOME/.bashrc: _$HOME/.bashrc\n" \
-                                       echo "_\$_PROFILE: _$_PROFILE\n" \
-                                       die "nvm_detect_profile didn't pick $SHELL and $HOME/.bashrc"
-
-#Let's force $SHELL to be zsh
-SHELL="/usr/bin/zsh"
-
-# $SHELL is set to zsh and .zshrc is there, it must be detected
-_PROFILE=$(nvm_detect_profile)
-[ "_$_PROFILE" = "_$HOME/.zshrc" ] || echo "_\$HOME/.zshrc: _$HOME/.zshrc\n" \
-                                      echo "_\$_PROFILE: _$_PROFILE\n" \
-                                      die "nvm_detect_profile didn't pick $SHELL and $HOME/.zshrc"
-
-
-# if we unset shell it looks for the files
-unset SHELL
 
 # $PROFILE points to a valid file, its path must be returned
 PROFILE="test_profile"
 _PROFILE=$(nvm_detect_profile)
-[ "_$_PROFILE" = "_$PROFILE" ] || echo "_\$_PROFILE: _$_PROFILE\n" \
-                                  echo "_\$PROFILE: _$PROFILE\n" \
-                                  die "nvm_detect_profile didn't pick \$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" ] || echo "_\$_PROFILE: _$_PROFILE\n" \
-                                   echo "_\$PROFILE: _$PROFILE\n" \
-                                   die "nvm_detect_profile shouldn't pick \$PROFILE when it's not a valid file"
+[ "_$_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 .profile if file exists
+# It should favor .bashrc if file exists
 _PROFILE=$(nvm_detect_profile)
-[ "_$_PROFILE" = "_$HOME/.profile" ] || echo "_\$_PROFILE: _$_PROFILE\n" \
-                                        echo "_\$PROFILE: _$PROFILE\n" \
-                                        die "nvm_detect_profile should have selected .profile"
-
-rm .profile
-# Otherwise, it should favor .bashrc if file exists
-_PROFILE=$(nvm_detect_profile)
-[ "_$_PROFILE" = "_$HOME/.bashrc" ] || echo "_\$_PROFILE: _$_PROFILE\n" \
-                                       echo "_\$PROFILE: _$PROFILE\n" \
-                                       die "nvm_detect_profile should have selected .bashrc"
+[ "_$_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" ] || echo "_\$_PROFILE: _$_PROFILE\n" \
-                                             echo "_\$PROFILE: _$PROFILE\n" \
-                                             die "nvm_detect_profile should have selected .bash_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" ] || echo "_\$_PROFILE: _$_PROFILE\n" \
-                                      echo "_\$PROFILE: _$PROFILE\n" \
-                                      die "nvm_detect_profile should have selected .zshrc"
+[ "_$_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" ] || echo "_\$_PROFILE: _$_PROFILE\n" \
-                      echo "_\$PROFILE: _$PROFILE\n" \
-                      die "nvm_detect_profile should have echo'ed an empty value"
+[ -z "$_PROFILE" ] || die "nvm_detect_profile should have echo'ed an empty value"
 
 
 cleanup
+

test/install_script/nvm_reset

@@ -15,7 +15,7 @@ safe_type() {
 safe_type nvm_reset || die 'nvm_reset is not available'
 
 # Apply nvm_reset
-nvm_reset || die 'nvm_reset failed'
+nvm_reset
 
 # The names should be unset
 ! safe_type nvm_do_install || die 'nvm_do_install is still available'

test/installation/io.js/install while reinstalling packages

@@ -16,8 +16,8 @@ nvm install iojs-v1.0.0
 
 node --version | grep v1.0.0 > /dev/null || die "nvm install didn't use iojs-v1.0.0"
 
-npm install -g object-is@0.0.0 || die "npm install -g object-is failed"
-npm list --global | grep object-is > /dev/null || die "object-is isn't installed"
+npm install -g is-nan@1.0.1 || die "npm install -g is-nan failed"
+npm list --global | grep is-nan > /dev/null || die "is-nan isn't installed"
 
 nvm ls iojs-1 | grep iojs-v1.0.0 > /dev/null || die "nvm ls iojs-1 didn't show iojs-v1.0.0"
 
@@ -28,5 +28,5 @@ nvm install iojs-v1.0.1 --reinstall-packages-from=iojs-1.0.0 || die "nvm install
 nvm use iojs-1
 node --version | grep v1.0.1 > /dev/null || die "nvm use iojs-1 didn't use v1.0.1"
 
-npm list --global | grep object-is > /dev/null || die "object-is isn't installed"
+npm list --global | grep is-nan > /dev/null || die "is-nan isn't installed"
 

test/installation/node/install from source without V8 snapshot for ARM

@@ -1,25 +0,0 @@
-#!/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
-
-# Fake ARM arch
-nvm_get_arch() {
-  echo "armv7l"
-}
-
-# Install from source
-nvm install -s $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed"
-
-# Check Install
-[ -d ../../../$NVM_TEST_VERSION ]
-node --version | grep $NVM_TEST_VERSION || "'node --version | grep $NVM_TEST_VERSION' failed"
-
-# Check V8 snapshot isn't compiled
-node -p "if(! process.config.variables.v8_use_snapshot) { console.log('no-snapshot'); }" | grep "no-snapshot" || "'node -p \"if(! process.config.variables.v8_use_snapshot) { console.log('no-snapshot'); }\" | grep \"no-snapshot\"' failed"

test/installation/node/install while reinstalling packages

@@ -18,8 +18,8 @@ nvm use 0.9.7
 
 node --version | grep v0.9.7 > /dev/null || die "nvm use 0.9.7 failed"
 
-npm install -g object-is@0.0.0 || die "npm install -g object-is failed"
-npm list --global | grep object-is > /dev/null || die "object-is isn't installed"
+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"
 
@@ -30,5 +30,5 @@ nvm install 0.9.12 --reinstall-packages-from=0.9 || die "nvm install 0.9.12 --re
 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 object-is > /dev/null || die "object-is isn't installed"
+npm list --global | grep is-nan > /dev/null || die "is-nan isn't installed"
 

test/slow/nvm reinstall-packages/should work as expected

@@ -4,15 +4,12 @@ die () { echo "$@" ; exit 1; }
 
 . ../../../nvm.sh
 
-nvm exec 0.10.28 npm install -g npm@~1.4.11 # this is required because before 1.4.10, npm ls doesn't indicated linked packages
-nvm exec 0.10.29 npm install -g npm@~1.4.11 # this is required because before 1.4.10, npm ls doesn't indicated linked packages
-
 nvm use 0.10.28
 (cd test-npmlink && npm link)
 
-EXPECTED_PACKAGES="autoprefixer bower david eslint grunt-cli grunth-cli http-server jshint marked node-gyp npmlist recursive-blame spawn-sync test-npmlink uglify-js yo"
+EXPECTED_PACKAGES="autoprefixer bower david eslint grunt-cli grunth-cli http-server jshint marked node-gyp npmlist recursive-blame test-npmlink uglify-js yo"
 
-echo "$EXPECTED_PACKAGES" | sed -e 's/test-npmlink //' | xargs npm install -g --quiet
+echo "$EXPECTED_PACKAGES" | xargs npm install -g --quiet
 
 get_packages() {
   npm list -g --depth=0 | \sed -e '1 d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | xargs

test/slow/nvm use/Running "nvm use iojs" uses latest io.js version

@@ -12,9 +12,3 @@ EXPECTED_OUTPUT="iojs-v1.0.1"
 
 [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
   || die "'nvm use iojs' + 'nvm current' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-
-OUTPUT="$(nvm use --silent iojs)"
-EXPECTED_OUTPUT=""
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use --silent iojs' output was not silenced '$EXPECTED_OUTPUT'; got '$OUTPUT'"

test/slow/nvm use/Running "nvm use node" uses latest stable node version

@@ -12,9 +12,3 @@ EXPECTED_OUTPUT="$(nvm_version stable)"
 
 [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
   || die "'nvm use node' + 'nvm current' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-
-OUTPUT="$(nvm use --silent node)"
-EXPECTED_OUTPUT=""
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use --silent node' output was not silenced '$EXPECTED_OUTPUT'; got '$OUTPUT'"

test/slow/nvm use/Running "nvm use v1.0.0" uses iojs-v1.0.0 iojs version

@@ -12,9 +12,3 @@ EXPECTED_OUTPUT="$(nvm_version v1.0.0)"
 
 [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
   || die "'nvm use v1.0.0' + 'nvm current' did not output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-
-OUTPUT="$(nvm use --silent 'v1.0.0')"
-EXPECTED_OUTPUT=""
-
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use --silent v1.0.0' output was not silenced '$EXPECTED_OUTPUT'; got '$OUTPUT'"

test/slow/nvm use/Running "nvm use" calls "nvm_die_on_prefix"

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-die () { echo $@ ; exit 1; }
-
-. ../../../nvm.sh
-
-nvm deactivate >/dev/null 2>&1 || die 'deactivate failed'
-
-nvm_die_on_prefix() {
-  echo >&2 "| $1 | $2 |"
-  return 3
-}
-
-OUTPUT="$(nvm use --silent node)"
-EXPECTED_OUTPUT=""
-[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] \
-  || die "'nvm use --silent node' did not call through to 'nvm_die_on_prefix' and give output '$EXPECTED_OUTPUT'; got '$OUTPUT'"
-
-EXIT_CODE="$(nvm use --silent node >/dev/null 2>&1; echo $?)"
-EXPECTED_CODE="11"
-[ "_$EXIT_CODE" = "_$EXPECTED_CODE" ] \
-  || die "'nvm use --silent node' when 'nvm_die_on_prefix' fails did not return '$EXPECTED_CODE'; got '$EXIT_CODE'"

test/slow/nvm_get_latest/nvm_get_latest

@@ -10,12 +10,12 @@ cleanup() {
 
 EXPECTED_VERSION="v12.3.456"
 URL="https://github.com/creationix/nvm/releases/tag/$EXPECTED_VERSION"
-EXPECTED_CURL_ARGS="-q -w %{url_effective}\n -L -s -S http://latest.nvm.sh -o /dev/null"
+EXPECTED_CURL_ARGS="-w %{url_effective}\n -L -s -S http://latest.nvm.sh -o /dev/null"
 EXPECTED_WGET_ARGS="http://latest.nvm.sh --server-response -O /dev/null"
 
 curl() {
   if [ "_$*" != "_$EXPECTED_CURL_ARGS" ]; then
-    echo >&2 "expected args ($EXPECTED_CURL_ARGS), got ($*)"
+    echo 2>& "expected args ($EXPECTED_CURL_ARGS), got ($*)"
     return 1
   else
     echo $URL
@@ -23,7 +23,7 @@ curl() {
 }
 wget() {
   if [ "_$*" != "_$EXPECTED_WGET_ARGS" ]; then
-    echo >&2 "expected args ($EXPECTED_WGET_ARGS), got ($*)"
+    echo 2>& "expected args ($EXPECTED_WGET_ARGS), got ($*)"
     return 1
   else
     local WGET_CONTENTS
@@ -100,7 +100,7 @@ Saving to: ‘/dev/null’
 "
     "$WGET_CONTENTS" | while read line
     do
-      >&2 echo "$line"
+      2>& echo "$line"
     done
   fi
 }