Merge branch 'master' into add-info-to-readme

.dockerignore

@@ -14,4 +14,3 @@ npm-debug.log
 
 .DS_Store
 current
-

.editorconfig

@@ -0,0 +1,22 @@
+root = true
+
+[*]
+tab_width = 2
+indent_size = 2
+charset = utf-8
+end_of_line = lf
+indent_style = space
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.txt]
+indent_size = false
+
+[test/fast/Listing versions/Running "nvm ls" calls into nvm_alias]
+indent_size = false
+
+[test/fast/Listing versions/Running "nvm ls --no-alias" does not call into nvm_alias]
+indent_size = false
+
+[Makefile]
+indent_style = tab

.gitattributes

@@ -1,2 +1 @@
 * eol=lf
-

.github/ISSUE_TEMPLATE.md

@@ -4,24 +4,24 @@
 - Operating system and version:
 
 - `nvm debug` output:
-<details>
-<!-- do not delete the following blank line -->
+  <details>
+  <!-- do not delete the following blank line -->
 
-```sh
+  ```sh
 
-```
-</details>
+  ```
+  </details>
 
 - `nvm ls` output:
-<details>
-<!-- do not delete the following blank line -->
+  <details>
+  <!-- do not delete the following blank line -->
 
-```sh
+  ```sh
 
-```
-</details>
+  ```
+  </details>
 
-- How did you install `nvm`? (e.g. install script in readme, homebrew):
+- How did you install `nvm`? (e.g. install script in readme, Homebrew):
 
 - What steps did you perform?
 
@@ -33,9 +33,10 @@
 
 <!-- if this does not apply, please delete this section -->
 - If you are having installation issues, or getting "N/A", what does `curl -I --compressed -v https://nodejs.org/dist/` print out?
-<details>
-<!-- do not delete the following blank line -->
+  <details>
+  <!-- do not delete the following blank line -->
 
-```sh
-```
-</details>
+  ```sh
+
+  ```
+  </details>

.gitignore

@@ -15,7 +15,7 @@ npm-debug.log
 
 .DS_Store
 current
-default-packages
+/default-packages
 
 # Only apps should have lockfiles
 npm-shrinkwrap.json

.travis.yml

@@ -1,5 +1,5 @@
 language: generic
-dist: trusty
+dist: xenial
 sudo: required
 addons:
   apt:
@@ -10,6 +10,7 @@ addons:
     #  - g++-4.8
 
 cache:
+  ccache: true
   directories:
     - $HOME/.npm
     - $TRAVIS_BUILD_DIR/.cache
@@ -18,27 +19,34 @@ before_install:
   - $SHELL --version 2> /dev/null || dpkg -s $SHELL 2> /dev/null || which $SHELL
   - curl --version
   - wget --version
+  - shellcheck --version
 install:
-  - if [ -z "${SHELLCHECK-}" ]; then nvm install node && npm install && npm prune && npm ls urchin doctoc; fi
+  - if [ -z "${SHELLCHECK-}" ]; then nvm install node && npm install && npm prune && npm ls urchin doctoc eclint dockerfile_lint; fi
   - '[ -z "$WITHOUT_CURL" ] || sudo apt-get remove curl -y'
 script:
   - if [ -n "${MAKE_RELEASE-}" ]; then export GIT_EDITOR="sed -i '1 s/^/99.99.99 make release test/'" && git fetch --unshallow --tags && echo proceed | make TAG=99.99.99 release ; fi
   - if [ -n "${DOCTOCCHECK-}" ]; then cp README.md README.md.orig && npm run doctoc && diff -q README.md README.md.orig ; fi
+  - if [ -n "${ECLINT-}" ]; then npm run eclint ; fi
+  - if [ -n "${DOCKERFILE_LINT-}" ]; then npm run dockerfile_lint ; fi
   - if [ -n "${SHELLCHECK-}" ]; then shellcheck -s bash nvm.sh && shellcheck -s sh nvm.sh && shellcheck -s dash nvm.sh && shellcheck -s ksh nvm.sh ; fi
   - if [ -n "${SHELLCHECK-}" ]; then shellcheck -s bash install.sh bash_completion nvm-exec ; fi
   - if [ -n "${SHELL-}" ] && [ -n "${TEST_SUITE}" ]; then if [ "${TEST_SUITE}" = 'installation_iojs' ]; then travis_retry make TEST_SUITE=$TEST_SUITE URCHIN="$(npm bin)/urchin" test-$SHELL ; else make TEST_SUITE=$TEST_SUITE URCHIN="$(npm bin)/urchin" test-$SHELL; fi; fi
 before_cache:
   - if [ -n "$WITHOUT_CURL" ]; then sudo apt-get install curl -y ; fi
+  - if [ -n "${NODE-}" ]; then . nvm.sh && set -ex && nvm install --latest-npm "${NODE}" && npm --version; fi
 env:
   global:
-    - CXX=g++-4.8
-    - CC=gcc-4.8
+    - CXX=g++
+    - CC=gcc
     - PATH="$(echo $PATH | sed 's/::/:/')"
+    - PATH="/usr/lib/ccache/:$PATH"
     - NVM_DIR="${TRAVIS_BUILD_DIR}"
   matrix:
     - MAKE_RELEASE=true
     - DOCTOCCHECK=true
     - SHELLCHECK=true
+    - ECLINT=true
+    - DOCKERFILE_LINT=true
     - SHELL=bash TEST_SUITE=install_script
     - SHELL=sh TEST_SUITE=fast
     - SHELL=dash TEST_SUITE=fast
@@ -75,3 +83,15 @@ env:
     - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1
   #  - SHELL=ksh TEST_SUITE=installation_iojs
   #  - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1
+    - NODE=10 TEST="nvm install-latest-npm"
+    - NODE=9 TEST="nvm install-latest-npm"
+    - NODE=8 TEST="nvm install-latest-npm"
+    - NODE=7 TEST="nvm install-latest-npm"
+    - NODE=6 TEST="nvm install-latest-npm"
+    - NODE=5 TEST="nvm install-latest-npm"
+    - NODE=5.9 TEST="nvm install-latest-npm"
+    - NODE=4 TEST="nvm install-latest-npm"
+    - NODE=4.6 TEST="nvm install-latest-npm"
+    - NODE=4.5 TEST="nvm install-latest-npm"
+    - NODE=4.4 TEST="nvm install-latest-npm"
+    - NODE=2 TEST="nvm install-latest-npm"

CONTRIBUTING.md

@@ -5,16 +5,17 @@ We love pull requests and issues, they're our favorite.
 However, before submitting, please review the following:
 
 For bug reports:
- - Please make sure the bug is reproducible, and give us the steps to reproduce it, so that we can dig into the problem.
- - Please give us as much detail as possible about your environment, so we can more easily confirm the problem.
+
+  - Please make sure the bug is reproducible, and give us the steps to reproduce it, so that we can dig into the problem.
+  - Please give us as much detail as possible about your environment, so we can more easily confirm the problem.
 
 For pull requests:
- - Please include tests. Changes with tests will be merged very quickly.
- - Please manually confirm that your changes work in `bash`, `sh`/`dash`, `ksh`, and `zsh`. Fast tests do run in these shells, but it's nice to manually verify also.
- - Please maintain consistent whitespace - 2-space indentation, trailing newlines in all files, etc.
- - Any time you make a change to your PR, please rebase freshly on top of master. Nobody likes merge commits.
+
+  - Please include tests. Changes with tests will be merged very quickly.
+  - Please manually confirm that your changes work in `bash`, `sh`/`dash`, `ksh`, and `zsh`. Fast tests do run in these shells, but it's nice to manually verify also.
+  - Please maintain consistent whitespace - 2-space indentation, trailing newlines in all files, etc.
+  - Any time you make a change to your PR, please rebase freshly on top of master. Nobody likes merge commits.
 
 Even if you don't have all of these items covered, please still feel free to submit a PR/issue! Someone else may be inspired and volunteer to complete it for you.
 
 Thanks again!
-

Dockerfile

@@ -8,14 +8,19 @@
 
 # Use Ubuntu Trusty Tahr as base image as we're using on Travis CI
 # I also tested with Ubuntu 16.04, should be good with it!
-From ubuntu:14.04
-MAINTAINER Peter Dave Hello <[email protected]>
+FROM ubuntu:14.04
+LABEL maintainer="Peter Dave Hello <[email protected]>"
+LABEL name="nvm-dev-env"
+LABEL version="latest"
+
+# Set the SHELL to bash with pipefail option
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 # Prevent dialog during apt install
 ENV DEBIAN_FRONTEND noninteractive
 
 # ShellCheck version
-ENV SHELLCHECK_VERSION=0.4.7
+ENV SHELLCHECK_VERSION=0.5.0
 
 # Pick a Ubuntu apt mirror site for better speed
 # ref: https://launchpad.net/ubuntu/+archivemirrors
@@ -24,7 +29,7 @@ ENV UBUNTU_APT_SITE ubuntu.cs.utah.edu
 # Disable src package source
 RUN sed -i 's/^deb-src\ /\#deb-src\ /g' /etc/apt/sources.list
 
-# Replace origin apt pacakge site with the mirror site
+# Replace origin apt package site with the mirror site
 RUN sed -E -i "s/([a-z]+.)?archive.ubuntu.com/$UBUNTU_APT_SITE/g" /etc/apt/sources.list
 RUN sed -i "s/security.ubuntu.com/$UBUNTU_APT_SITE/g" /etc/apt/sources.list
 
@@ -83,27 +88,28 @@ RUN wget --version
 # Add user "nvm" as non-root user
 RUN useradd -ms /bin/bash nvm
 
+# Copy and set permission for nvm directory
+COPY . /home/nvm/.nvm/
+RUN chown nvm:nvm -R "home/nvm/.nvm"
+
 # Set sudoer for "nvm"
 RUN echo 'nvm ALL=(ALL) NOPASSWD: ALL' >> /etc/sudoers
 
 # Switch to user "nvm" from now
 USER nvm
 
 # nvm
-COPY . /home/nvm/.nvm/
-RUN sudo chown nvm:nvm -R $HOME/.nvm
-RUN echo 'export NVM_DIR="$HOME/.nvm"'                                        >> $HOME/.bashrc
-RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> $HOME/.bashrc
-RUN echo '[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> $HOME/.bashrc
+RUN echo 'export NVM_DIR="$HOME/.nvm"'                                       >> "$HOME/.bashrc"
+RUN echo '[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm' >> "$HOME/.bashrc"
+RUN echo '[ -s "$NVM_DIR/bash_completion" ] && . "$NVM_DIR/bash_completion" # This loads nvm bash_completion' >> "$HOME/.bashrc"
 
 # nodejs and tools
 RUN bash -c 'source $HOME/.nvm/nvm.sh   && \
     nvm install node                    && \
-    npm install -g doctoc urchin        && \
+    npm install -g doctoc urchin eclint dockerfile_lint && \
     npm install --prefix "$HOME/.nvm/"'
 
 # Set WORKDIR to nvm directory
 WORKDIR /home/nvm/.nvm
 
-ENTRYPOINT /bin/bash
-
+ENTRYPOINT ["/bin/bash"]

LICENSE.md

@@ -2,6 +2,8 @@ The MIT License (MIT)
 
 Copyright (c) 2010 Tim Caswell
 
+Copyright (c) 2014 Jordan Harband
+
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
 the Software without restriction, including without limitation the rights to
@@ -18,4 +20,3 @@ FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
 COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
 IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-

Makefile

@@ -41,9 +41,9 @@ list:
 .PHONY: $(SHELL_TARGETS)
 $(SHELL_TARGETS):
 	@shell='$@'; shell=$${shell##*-}; which "$$shell" >/dev/null || { printf '\033[0;31m%s\033[0m\n' "WARNING: Cannot test with shell '$$shell': not found." >&2; exit 0; } && \
-	 printf '\n\033[0;34m%s\033[0m\n' "Running tests in $$shell"; \
-	 [ -z "$$TRAVIS_BUILD_DIR" ] && for v in $$(set | awk -F'=' '$$1 ~ "^NVM_" { print $$1 }'); do unset $$v; done && unset v; \
-	 for suite in $(TEST_SUITE); do $(URCHIN) -f -s $$shell test/$$suite || exit; done
+	printf '\n\033[0;34m%s\033[0m\n' "Running tests in $$shell"; \
+	[ -z "$$TRAVIS_BUILD_DIR" ] && for v in $$(set | awk -F'=' '$$1 ~ "^NVM_" { print $$1 }'); do unset $$v; done && unset v; \
+	for suite in $(TEST_SUITE); do $(URCHIN) -f -s $$shell test/$$suite || exit; done
 
 # All-tests target: invokes the specified test suites for ALL shells defined in $(SHELLS).
 .PHONY: test
@@ -72,14 +72,14 @@ _ensure-clean:
 .PHONY: release
 release: _ensure-tag _ensure-clean _ensure-current-version
 	@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 "v$$new_ver"
+	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 "v$$new_ver"