v0.24.2

Fixes #721

.gitattributes

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

README.markdown

@@ -16,11 +16,11 @@ Note: `nvm` does not support [Fish] either (see [#303](https://github.com/creati
 
 To install you could use the [install script][2] using cURL:
 
-    curl https://raw.githubusercontent.com/creationix/nvm/v0.25.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.25.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>
 
@@ -39,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.
@@ -187,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:
@@ -220,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.25.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

install.sh

@@ -11,7 +11,7 @@ if [ -z "$NVM_DIR" ]; then
 fi
 
 nvm_latest_version() {
-  echo "v0.25.0"
+  echo "v0.24.2"
 }
 
 #
@@ -71,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
+    cd "$NVM_DIR" && command git branch --quiet -D master >/dev/null 2>&1
   fi
   return
 }

nvm-exec

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

nvm.sh

@@ -58,12 +58,6 @@ nvm_has_system_iojs() {
   [ "$(nvm deactivate >/dev/null 2>&1 && command -v iojs)" != '' ]
 }
 
-nvm_print_npm_version() {
-  if nvm_has "npm"; then
-    npm --version 2>/dev/null | command xargs printf " (npm v%s)"
-  fi
-}
-
 # Make zsh glob matching behave same as bash
 # This fixes the "zsh: no matches found" errors
 if nvm_has "unsetopt"; then
@@ -313,7 +307,7 @@ nvm_is_valid_version() {
 }
 
 nvm_normalize_version() {
-  echo "${1#v}" | command awk -F. '{ printf("%d%06d%06d\n", $1,$2,$3); }'
+  echo "${1#v*}" | command awk -F. '{ printf("%d%06d%06d\n", $1,$2,$3); }'
 }
 
 nvm_ensure_version_prefix() {
@@ -330,7 +324,7 @@ nvm_format_version() {
   local VERSION
   VERSION="$(nvm_ensure_version_prefix "$1")"
   if [ "_$(nvm_num_version_groups "$VERSION")" != "_3" ]; then
-    nvm_format_version "${VERSION%.}.0"
+    nvm_format_version "${VERSION%*\.}.0"
   else
     echo "$VERSION"
   fi
@@ -339,12 +333,12 @@ nvm_format_version() {
 nvm_num_version_groups() {
   local VERSION
   VERSION="$1"
-  VERSION="${VERSION#v}"
-  VERSION="${VERSION%.}"
   if [ -z "$VERSION" ]; then
     echo "0"
     return
   fi
+  VERSION="${VERSION#v*}"
+  VERSION="${VERSION%\.}"
   local NVM_NUM_DOTS
   NVM_NUM_DOTS=$(echo "$VERSION" | command sed -e 's/[^\.]//g')
   local NVM_NUM_GROUPS
@@ -516,7 +510,7 @@ nvm_strip_iojs_prefix() {
   if [ "_$1" = "_$NVM_IOJS_PREFIX" ]; then
     echo
   else
-    echo "${1#"$NVM_IOJS_PREFIX"-}"
+    echo "${1#"$NVM_IOJS_PREFIX"-*}"
   fi
 }
 
@@ -571,7 +565,7 @@ nvm_ls() {
         local NUM_VERSION_GROUPS
         NUM_VERSION_GROUPS="$(nvm_num_version_groups "$PATTERN")"
         if [ "_$NUM_VERSION_GROUPS" = "_2" ] || [ "_$NUM_VERSION_GROUPS" = "_1" ]; then
-          PATTERN="${PATTERN%.}."
+          PATTERN="${PATTERN%*\.}."
         fi
       ;;
     esac
@@ -687,10 +681,9 @@ nvm_ls_remote_iojs() {
     PATTERN=".*"
   fi
   VERSIONS="$(nvm_download -L -s $NVM_IOJS_ORG_VERSION_LISTING -o - \
-    | command sed "
-        1d;
-        s/^/$(nvm_iojs_prefix)-/;
-        s/[[:blank:]].*//" \
+    | command sed 1d \
+    | command sed "s/^/$(nvm_iojs_prefix)-/" \
+    | command cut -f1 \
     | command grep -w "$PATTERN" \
     | command sort)"
   if [ -z "$VERSIONS" ]; then
@@ -880,25 +873,6 @@ nvm_get_arch() {
   echo "$NVM_ARCH"
 }
 
-nvm_ensure_default_set() {
-  local VERSION
-  VERSION="$1"
-  if [ -z "$VERSION" ]; then
-    echo 'nvm_ensure_default_set: a version is required' >&2
-    return 1
-  fi
-  if nvm_alias default >/dev/null 2>&1; then
-    # default already set
-    return 0
-  fi
-  local OUTPUT
-  OUTPUT="$(nvm alias default "$VERSION")"
-  local EXIT_CODE
-  EXIT_CODE="$?"
-  echo "Creating default alias: $OUTPUT"
-  return $EXIT_CODE
-}
-
 nvm_install_iojs_binary() {
   local PREFIXED_VERSION
   PREFIXED_VERSION="$1"
@@ -973,7 +947,7 @@ nvm_install_node_binary() {
     if nvm_binary_available "$VERSION"; then
       local NVM_ARCH
       NVM_ARCH="$(nvm_get_arch)"
-      if [ $NVM_ARCH = "armv6l" ] || [ $NVM_ARCH = "armv7l" ]; then
+      if [ $NVM_ARCH = "armv6l" ]; then
          NVM_ARCH="arm-pi"
       fi
       t="$VERSION-$NVM_OS-$NVM_ARCH"
@@ -1006,8 +980,10 @@ nvm_install_node_binary() {
 nvm_install_node_source() {
   local VERSION
   VERSION="$1"
+  local REINSTALL_PACKAGES_FROM
+  REINSTALL_PACKAGES_FROM="$2"
   local ADDITIONAL_PARAMETERS
-  ADDITIONAL_PARAMETERS="$2"
+  ADDITIONAL_PARAMETERS="$3"
 
   if [ -n "$ADDITIONAL_PARAMETERS" ]; then
     echo "Additional options while compiling: $ADDITIONAL_PARAMETERS"
@@ -1053,6 +1029,9 @@ nvm_install_node_source() {
     $make $MAKE_CXX install
     )
   then
+    if nvm use "$VERSION" && [ ! -z "$REINSTALL_PACKAGES_FROM" ] && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
+      nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
+    fi
     if ! nvm_has "npm" ; then
       echo "Installing npm..."
       if nvm_version_greater 0.2.0 "$VERSION"; then
@@ -1225,29 +1204,31 @@ nvm() {
         # io.js does not have a SunOS binary
         nobinary=1
       fi
-      local NVM_INSTALL_SUCCESS
       # skip binary install if "nobinary" option specified.
       if [ $nobinary -ne 1 ] && nvm_binary_available "$VERSION"; then
+        local NVM_INSTALL_SUCCESS
         if [ "$NVM_IOJS" = true ] && nvm_install_iojs_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
           NVM_INSTALL_SUCCESS=true
         elif [ "$NVM_IOJS" != true ] && nvm_install_node_binary "$VERSION" "$REINSTALL_PACKAGES_FROM"; then
           NVM_INSTALL_SUCCESS=true
         fi
-      elif [ "$NVM_IOJS" = true ]; then
-        # nvm_install_iojs_source "$VERSION" "$ADDITIONAL_PARAMETERS"
-        echo "Installing iojs from source is not currently supported" >&2
-        return 105
-      elif nvm_install_node_source "$VERSION" "$ADDITIONAL_PARAMETERS"; then
-        NVM_INSTALL_SUCCESS=true
-      fi
 
-      if [ "$NVM_INSTALL_SUCCESS" = true ] && nvm use "$VERSION"; then
-        if [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
+        if [ "$NVM_INSTALL_SUCCESS" = true ] \
+          && nvm use "$VERSION" \
+          && [ ! -z "$REINSTALL_PACKAGES_FROM" ] \
           && [ "_$REINSTALL_PACKAGES_FROM" != "_N/A" ]; then
           nvm reinstall-packages "$REINSTALL_PACKAGES_FROM"
         fi
+        return $?
+      fi
+
+      if [ "$NVM_IOJS" = true ]; then
+        # nvm_install_iojs_source "$VERSION" "$REINSTALL_PACKAGES_FROM" "$ADDITIONAL_PARAMETERS"
+        echo "Installing iojs from source is not currently supported" >&2
+        return 105
+      else
+        nvm_install_node_source "$VERSION" "$REINSTALL_PACKAGES_FROM" "$ADDITIONAL_PARAMETERS"
       fi
-      return $?
     ;;
     "uninstall" )
       if [ $# -ne 2 ]; then
@@ -1366,10 +1347,10 @@ nvm() {
 
       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)$(nvm_print_npm_version)"
+          echo "Now using system version of node: $(node -v 2>/dev/null)."
           return
         elif nvm_has_system_iojs && nvm deactivate >/dev/null 2>&1; then
-          echo "Now using system version of io.js: $(iojs --version 2>/dev/null)$(nvm_print_npm_version)"
+          echo "Now using system version of io.js: $(iojs --version 2>/dev/null)."
           return
         else
           echo "System version of node not found." >&2
@@ -1413,9 +1394,9 @@ nvm() {
         command rm -f "$NVM_DIR/current" && ln -s "$NVM_VERSION_DIR" "$NVM_DIR/current"
       fi
       if nvm_is_iojs_version "$VERSION"; then
-        echo "Now using io.js $(nvm_strip_iojs_prefix "$VERSION")$(nvm_print_npm_version)"
+        echo "Now using io.js $(nvm_strip_iojs_prefix "$VERSION")"
       else
-        echo "Now using node $VERSION$(nvm_print_npm_version)"
+        echo "Now using node $VERSION"
       fi
     ;;
     "run" )
@@ -1470,13 +1451,6 @@ nvm() {
       if [ "_$VERSION" = "_N/A" ]; then
         echo "$(nvm_ensure_version_prefix "$provided_version") is not installed yet" >&2
         EXIT_CODE=1
-      elif [ -z "$ARGS" ]; then
-        if [ "$NVM_IOJS" = true ]; then
-          nvm exec "$VERSION" iojs
-        else
-          nvm exec "$VERSION" node
-        fi
-        EXIT_CODE="$?"
       elif [ "$NVM_IOJS" = true ]; then
         echo "Running io.js $(nvm_strip_iojs_prefix "$VERSION")"
         OUTPUT="$(nvm use "$VERSION" >/dev/null && iojs $ARGS)"
@@ -1729,7 +1703,7 @@ $NVM_LS_REMOTE_IOJS_OUTPUT" | command grep -v "N/A" | sed '/^$/d')"
       nvm_version $2
     ;;
     "--version" )
-      echo "0.25.0"
+      echo "0.24.2"
     ;;
     "unload" )
       unset -f nvm nvm_print_versions nvm_checksum \
@@ -1753,7 +1727,7 @@ nvm_supports_source_options() {
   [ "_$(echo 'echo $1' | . /dev/stdin yes 2> /dev/null)" = "_yes" ]
 }
 
-VERSION="$(nvm_alias default 2>/dev/null)"
+VERSION="$(nvm_alias default 2>/dev/null || echo)"
 if nvm_supports_source_options && [ "_$1" = "_--install" ]; then
   if [ -n "$VERSION" ]; then
     nvm install "$VERSION" >/dev/null

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nvm",
-  "version": "0.25.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": "^4.3.3",
-    "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 use system" should work as expected

@@ -5,13 +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"
+[ "$(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"
 

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_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_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/sourcing/Sourcing nvm.sh with no default should return 0

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+die () { echo $@ ; exit 1; }
+
+touch ../../alias/default
+rm ../../alias/default || die 'removal of default alias failed'
+nvm_alias default && die '"nvm_alias default" did not fail'
+
+set -e # necessary to fail internally with a nonzero code
+
+. ../../nvm.sh || die 'sourcing returned nonzero exit code'