Merge 996ae54fde62ef7791e96c9be6bdcbf2dd95b0e8 into d90a7910db093fde559611ffe79f5f2af0c3ad30

.github/workflows/tests.yml

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

.travis.yml

@@ -87,8 +87,18 @@ 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,12 +121,7 @@ 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 to postpone using `nvm` until you manually [`use`](#usage) it:
+- 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.
-
-```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.