Merge 996ae54fde62ef7791e96c9be6bdcbf2dd95b0e8 into 247ed8a1860560b20149265e3ff094f2cb40e7c3

Remove equivalent TravisCI entries

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

.github/workflows/tests.yml

@@ -31,6 +31,8 @@ jobs:
         suite:
           - install_script
           - sourcing
+          - slow
+          - installation_iojs
         shell:
           - sh
           - bash

.travis.yml

@@ -87,18 +87,8 @@ env:
     - 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=installation_iojs
     - SHELL=sh TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    - SHELL=dash TEST_SUITE=installation_iojs
     - SHELL=dash TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    - SHELL=bash TEST_SUITE=installation_iojs
     - SHELL=bash TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    - SHELL=zsh TEST_SUITE=installation_iojs
     - SHELL=zsh TEST_SUITE=installation_iojs WITHOUT_CURL=1
-    #  - SHELL=ksh TEST_SUITE=installation_iojs
     #  - SHELL=ksh TEST_SUITE=installation_iojs WITHOUT_CURL=1

README.md

@@ -121,7 +121,12 @@ export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || pr
 
 - If the environment variable `$XDG_CONFIG_HOME` is present, it will place the `nvm` files there.</sub>
 
-- You can add `--no-use` to the end of the above script (...`nvm.sh --no-use`) to postpone using `nvm` until you manually [`use`](#usage) it.
+- You can add `--no-use` to the end of the above script to postpone using `nvm` until you manually [`use`](#usage) it:
+
+```sh
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" --no-use # This loads nvm, without auto-using the default version
+```
 
 - You can customize the install source, directory, profile, and version using the `NVM_SOURCE`, `NVM_DIR`, `PROFILE`, and `NODE_VERSION` variables.
 Eg: `curl ... | NVM_DIR="path/to/nvm"`. Ensure that the `NVM_DIR` does not contain a trailing slash.

install.sh

@@ -106,7 +106,7 @@ nvm_node_version() {
 
 nvm_download() {
   if nvm_has "curl"; then
-    curl --fail --compressed -q "$@"
+    command curl --fail --compressed -q "$@"
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \

nvm.sh

@@ -101,7 +101,7 @@ nvm_get_latest() {
     if nvm_curl_use_compression; then
       CURL_COMPRESSED_FLAG="--compressed"
     fi
-    NVM_LATEST_URL="$(curl ${CURL_COMPRESSED_FLAG:-} -q -w "%{url_effective}\\n" -L -s -S https://latest.nvm.sh -o /dev/null)"
+    NVM_LATEST_URL="$(command curl ${CURL_COMPRESSED_FLAG:-} -q -w "%{url_effective}\\n" -L -s -S https://latest.nvm.sh -o /dev/null)"
   elif nvm_has "wget"; then
     NVM_LATEST_URL="$(wget -q https://latest.nvm.sh --server-response -O /dev/null 2>&1 | command awk '/^  Location: /{DEST=$2} END{ print DEST }')"
   else
@@ -133,7 +133,7 @@ nvm_download() {
     for arg in "$@"; do
       NVM_DOWNLOAD_ARGS="${NVM_DOWNLOAD_ARGS} \"$arg\""
     done
-    eval "curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} ${NVM_DOWNLOAD_ARGS}"
+    eval "command curl -q --fail ${CURL_COMPRESSED_FLAG:-} ${CURL_HEADER_FLAG:-} ${NVM_DOWNLOAD_ARGS}"
   elif nvm_has "wget"; then
     # Emulate curl with wget
     ARGS=$(nvm_echo "$@" | command sed -e 's/--progress-bar /--progress=bar /' \