From 2cd2c0f72e7bae3bb9f6d340f7fa57d6023f37d1 Mon Sep 17 00:00:00 2001 From: Peter Dave Hello Date: Mon, 26 Feb 2018 01:01:30 +0800 Subject: [PATCH] Remove useless trailing newlines --- .dockerignore | 1 - .gitattributes | 1 - CONTRIBUTING.md | 1 - Dockerfile | 1 - LICENSE.md | 1 - bash_completion | 1 - .../\"nvm alias\" should not accept aliases with slashes" | 1 - .../\"nvm unalias\" should not accept aliases with slashes" | 1 - ...\"nvm alias\" lists implicit aliases when they do not exist" | 1 - test/fast/Aliases/circular/setup | 1 - test/fast/Aliases/circular/teardown | 1 - test/fast/Listing versions/teardown | 1 - test/fast/Unit tests/nvm_alias | 1 - test/fast/Unit tests/nvm_alias_path | 1 - test/fast/Unit tests/nvm_find_up | 1 - test/fast/Unit tests/nvm_format_version | 1 - test/fast/Unit tests/nvm_has | 1 - test/fast/Unit tests/nvm_ls_remote_iojs | 1 - test/fast/Unit tests/nvm_num_version_groups | 1 - test/fast/Unit tests/nvm_print_implicit_alias errors | 1 - test/fast/Unit tests/nvm_remote_versions | 1 - test/fast/Unit tests/nvm_tree_contains_path | 1 - test/fast/Unit tests/nvm_validate_implicit_alias | 1 - test/fast/Unit tests/nvm_version_dir | 1 - test/fast/Unit tests/nvm_version_greater | 1 - test/fast/Unit tests/nvm_version_path | 1 - test/install_script/nvm_do_install | 1 - test/install_script/nvm_install_dir | 1 - test/install_script/nvm_install_with_aliased_dot | 1 - test/install_script/nvm_reset | 1 - test/install_script/nvm_source | 1 - test/installation_iojs/setup_dir | 1 - test/installation_iojs/teardown_dir | 1 - test/installation_node/install from source implicitly | 1 - test/installation_node/install hook | 2 -- .../install version specified in .nvmrc from binary | 2 -- .../install version specified in .nvmrc from source | 2 -- test/installation_node/setup_dir | 1 - test/installation_node/teardown_dir | 1 - test/slow/node 0.6.21 should install 0.6.21-pre | 1 - .../slow/nvm exec/Preamble works and respects \"silent\" flag" | 1 - .../Running \"nvm exec\" should pick up .nvmrc version" | 1 - test/slow/nvm exec/setup_dir | 1 - test/slow/nvm exec/teardown_dir | 1 - ...ng \"nvm copy-packages $(nvm ls current)\" should error out" | 1 - test/slow/nvm reinstall-packages/setup_dir | 1 - test/slow/nvm reinstall-packages/teardown_dir | 1 - .../Running \"nvm run --harmony --version\" should work" | 1 - "test/slow/nvm run/Running \"nvm run 0.x\" should work" | 1 - .../nvm run/Running \"nvm run\" should pick up .nvmrc version" | 1 - test/slow/nvm run/setup_dir | 1 - test/slow/nvm run/teardown_dir | 1 - test/slow/nvm_get_latest/nvm_get_latest | 1 - test/slow/nvm_get_latest/nvm_get_latest failed redirect | 1 - .../Sourcing nvm.sh should use the default if available | 1 - .../Sourcing nvm.sh with --install and .nvmrc should install it | 1 - .../Sourcing nvm.sh with --install should install the default | 1 - .../Sourcing nvm.sh with --no-use should not use anything | 1 - test/sourcing/setup | 1 - test/sourcing/teardown | 1 - 60 files changed, 63 deletions(-) diff --git a/.dockerignore b/.dockerignore index 06846809..fc578ccc 100644 --- a/.dockerignore +++ b/.dockerignore @@ -14,4 +14,3 @@ npm-debug.log .DS_Store current - diff --git a/.gitattributes b/.gitattributes index a64f3204..fae8897c 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1 @@ * eol=lf - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5194234a..03542934 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -17,4 +17,3 @@ For pull requests: 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! - diff --git a/Dockerfile b/Dockerfile index be3e8ef0..b0cf682c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -106,4 +106,3 @@ RUN bash -c 'source $HOME/.nvm/nvm.sh && \ WORKDIR /home/nvm/.nvm ENTRYPOINT /bin/bash - diff --git a/LICENSE.md b/LICENSE.md index 4b756d41..2b115b16 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -18,4 +18,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. - diff --git a/bash_completion b/bash_completion index 328b5650..989dde7d 100644 --- a/bash_completion +++ b/bash_completion @@ -95,4 +95,3 @@ if [[ -n ${ZSH_VERSION-} ]]; then fi complete -o default -F __nvm nvm - diff --git "a/test/fast/Aliases/\"nvm alias\" should not accept aliases with slashes" "b/test/fast/Aliases/\"nvm alias\" should not accept aliases with slashes" index 1d71a1c5..d10937d6 100755 --- "a/test/fast/Aliases/\"nvm alias\" should not accept aliases with slashes" +++ "b/test/fast/Aliases/\"nvm alias\" should not accept aliases with slashes" @@ -24,4 +24,3 @@ EXPECTED_OUTPUT="Aliases in subdirectories are not supported." EXIT_CODE="$(nvm alias /bar baz >/dev/null 2>&1 ; echo $?)" [ "$EXIT_CODE" = "1" ] || die "trying to create an alias starting with a slash should fail with code 1, got '$EXIT_CODE'" - diff --git "a/test/fast/Aliases/\"nvm unalias\" should not accept aliases with slashes" "b/test/fast/Aliases/\"nvm unalias\" should not accept aliases with slashes" index f7e226fd..2afafad4 100755 --- "a/test/fast/Aliases/\"nvm unalias\" should not accept aliases with slashes" +++ "b/test/fast/Aliases/\"nvm unalias\" should not accept aliases with slashes" @@ -24,4 +24,3 @@ EXPECTED_OUTPUT="Aliases in subdirectories are not supported." EXIT_CODE="$(nvm unalias /bar >/dev/null 2>&1 ; echo $?)" [ "$EXIT_CODE" = "1" ] || die "trying to remove an alias starting with a slash should fail with code 1, got '$EXIT_CODE'" - diff --git "a/test/fast/Aliases/Running \"nvm alias\" lists implicit aliases when they do not exist" "b/test/fast/Aliases/Running \"nvm alias\" lists implicit aliases when they do not exist" index 4b00855a..24a341c7 100755 --- "a/test/fast/Aliases/Running \"nvm alias\" lists implicit aliases when they do not exist" +++ "b/test/fast/Aliases/Running \"nvm alias\" lists implicit aliases when they do not exist" @@ -24,4 +24,3 @@ EXPECTED_IOJS="$(nvm_print_implicit_alias local iojs)" IOJS_VERSION="$(nvm_version "$EXPECTED_IOJS")" echo "$NVM_ALIAS_OUTPUT" | \grep -F "iojs -> $EXPECTED_IOJS (-> $IOJS_VERSION) (default)" \ || die "nvm alias did not contain the default local iojs version; got '$NVM_ALIAS_OUTPUT'" - diff --git a/test/fast/Aliases/circular/setup b/test/fast/Aliases/circular/setup index 8f2b142b..4af6dc07 100755 --- a/test/fast/Aliases/circular/setup +++ b/test/fast/Aliases/circular/setup @@ -7,4 +7,3 @@ echo three > ../../../../alias/two echo one > ../../../../alias/three echo two > ../../../../alias/four - diff --git a/test/fast/Aliases/circular/teardown b/test/fast/Aliases/circular/teardown index 9b6c79c2..d83ee819 100755 --- a/test/fast/Aliases/circular/teardown +++ b/test/fast/Aliases/circular/teardown @@ -7,4 +7,3 @@ rm -f ../../../../alias/two rm -f ../../../../alias/three rm -f ../../../../alias/four - diff --git a/test/fast/Listing versions/teardown b/test/fast/Listing versions/teardown index 25669eae..7c965acf 100755 --- a/test/fast/Listing versions/teardown +++ b/test/fast/Listing versions/teardown @@ -14,4 +14,3 @@ rmdir ../../../versions >/dev/null 2>&1 unalias nvm_has_system_node >/dev/null 2>&1 rm -f ../../../alias/stable >/dev/null 2>&1 rm -f ../../../alias/unstable >/dev/null 2>&1 - diff --git a/test/fast/Unit tests/nvm_alias b/test/fast/Unit tests/nvm_alias index 30917fc7..49cac2dd 100755 --- a/test/fast/Unit tests/nvm_alias +++ b/test/fast/Unit tests/nvm_alias @@ -30,4 +30,3 @@ OUTPUT="$(nvm_alias test)" [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_alias test' produced wrong output; got $OUTPUT" cleanup - diff --git a/test/fast/Unit tests/nvm_alias_path b/test/fast/Unit tests/nvm_alias_path index f62c352b..e86d87a1 100755 --- a/test/fast/Unit tests/nvm_alias_path +++ b/test/fast/Unit tests/nvm_alias_path @@ -5,4 +5,3 @@ die () { echo "$@" ; exit 1; } \. ../../../nvm.sh [ "_$(nvm_alias_path)" = "_$NVM_DIR/alias" ] || die "nvm_alias_path did not requrn correct location" - diff --git a/test/fast/Unit tests/nvm_find_up b/test/fast/Unit tests/nvm_find_up index bdef19fa..29c4e424 100755 --- a/test/fast/Unit tests/nvm_find_up +++ b/test/fast/Unit tests/nvm_find_up @@ -23,4 +23,3 @@ TEST_DIR="$PWD" [ "~$(PWD=$TEST_DIR/tmp_nvm_find_up/a/b/c/d nvm_find_up 'test')" = "~$TEST_DIR/tmp_nvm_find_up/a/b/c" ] || die "failed to find 1 level up from current dir" cleanup - diff --git a/test/fast/Unit tests/nvm_format_version b/test/fast/Unit tests/nvm_format_version index 615aa354..98541fe6 100755 --- a/test/fast/Unit tests/nvm_format_version +++ b/test/fast/Unit tests/nvm_format_version @@ -18,4 +18,3 @@ INPUT="1.2.3.4.5" OUTPUT="$(nvm_format_version "$INPUT")" EXPECTED_OUTPUT="v1.2.3" [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_format_version $INPUT did not return $EXPECTED_OUTPUT; got $OUTPUT" - diff --git a/test/fast/Unit tests/nvm_has b/test/fast/Unit tests/nvm_has index c1a3b59d..8a7d7be1 100755 --- a/test/fast/Unit tests/nvm_has +++ b/test/fast/Unit tests/nvm_has @@ -9,4 +9,3 @@ nvm_has cat && type cat > /dev/null || die 'nvm_has locates "cat" properly' [ "~$(nvm_has foobarbaz 2>&1)" = "~" ] || die "nvm_has does not suppress error output" ! nvm_has foobarbaz && ! type foobarbaz >/dev/null 2>&1 || die "nvm_has does not return a nonzero exit code when not found" - diff --git a/test/fast/Unit tests/nvm_ls_remote_iojs b/test/fast/Unit tests/nvm_ls_remote_iojs index 76280ee1..553aefd9 100755 --- a/test/fast/Unit tests/nvm_ls_remote_iojs +++ b/test/fast/Unit tests/nvm_ls_remote_iojs @@ -35,4 +35,3 @@ iojs-v1.0.4" [ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "nvm_ls_remote_iojs 1.0 did not output 1.0.x versions; got $OUTPUT" cleanup - diff --git a/test/fast/Unit tests/nvm_num_version_groups b/test/fast/Unit tests/nvm_num_version_groups index 45f7926b..ab09f0c5 100755 --- a/test/fast/Unit tests/nvm_num_version_groups +++ b/test/fast/Unit tests/nvm_num_version_groups @@ -22,4 +22,3 @@ die () { echo "$@" ; exit 1; } [ "~$(nvm_num_version_groups 1.2.3)" = "~3" ] || die "1.2.3 should give 3" [ "~$(nvm_num_version_groups v1.2.3)" = "~3" ] || die "v1.2.3 should give 3" [ "~$(nvm_num_version_groups v1.2.3.)" = "~3" ] || die "v1.2.3. should give 3" - diff --git a/test/fast/Unit tests/nvm_print_implicit_alias errors b/test/fast/Unit tests/nvm_print_implicit_alias errors index fc06a3cf..5565eea0 100755 --- a/test/fast/Unit tests/nvm_print_implicit_alias errors +++ b/test/fast/Unit tests/nvm_print_implicit_alias errors @@ -23,4 +23,3 @@ EXPECTED_SECOND_MSG="Only implicit aliases 'stable', 'unstable', 'iojs', and 'no SECOND_EXIT_CODE="$(nvm_print_implicit_alias local > /dev/null 2>&1 ; echo $?)" [ "_$SECOND_EXIT_CODE" = "_2" ] \ || die "nvm_print_implicit_alias without stable|unstable|iojs|node had wrong exit code: expected 2, got $SECOND_EXIT_CODE" - diff --git a/test/fast/Unit tests/nvm_remote_versions b/test/fast/Unit tests/nvm_remote_versions index 72bc916d..e4136b29 100755 --- a/test/fast/Unit tests/nvm_remote_versions +++ b/test/fast/Unit tests/nvm_remote_versions @@ -75,4 +75,3 @@ EXIT_CODE="$(nvm_remote_versions iojs >/dev/null 2>&1 ; echo $?)" [ "_$EXIT_CODE" = "_0" ] || die "nvm_remote_versions iojs did not exit with 0, got $EXIT_CODE" cleanup - diff --git a/test/fast/Unit tests/nvm_tree_contains_path b/test/fast/Unit tests/nvm_tree_contains_path index a64930ce..9b40854b 100755 --- a/test/fast/Unit tests/nvm_tree_contains_path +++ b/test/fast/Unit tests/nvm_tree_contains_path @@ -29,4 +29,3 @@ nvm_tree_contains_path tmp2 tmp2/node || die '"tmp2" should contain "tmp2/node"' nvm_tree_contains_path tmp2 tmp/node && die '"tmp2" should not contain "tmp/node"' cleanup - diff --git a/test/fast/Unit tests/nvm_validate_implicit_alias b/test/fast/Unit tests/nvm_validate_implicit_alias index 52c0e2f4..8fd6ecf1 100755 --- a/test/fast/Unit tests/nvm_validate_implicit_alias +++ b/test/fast/Unit tests/nvm_validate_implicit_alias @@ -18,4 +18,3 @@ nvm_validate_implicit_alias stable || die "nvm_validate_implicit_alias stable di nvm_validate_implicit_alias unstable || die "nvm_validate_implicit_alias unstable did not exit 0" nvm_validate_implicit_alias node || die "nvm_validate_implicit_alias node did not exit 0" nvm_validate_implicit_alias iojs || die "nvm_validate_implicit_alias iojs did not exit 0" - diff --git a/test/fast/Unit tests/nvm_version_dir b/test/fast/Unit tests/nvm_version_dir index daec9846..ad4bd96b 100755 --- a/test/fast/Unit tests/nvm_version_dir +++ b/test/fast/Unit tests/nvm_version_dir @@ -9,4 +9,3 @@ die () { echo "$@" ; exit 1; } [ "$(nvm_version_dir new)" = "$(nvm_version_dir)" ] || die '"nvm_version_dir new" did not return new dir path' [ "$(nvm_version_dir old)" = "$NVM_DIR" ] || die '"nvm_version_dir old" did not return old dir path' [ "$(nvm_version_dir foo 2>&1)" = "unknown version dir" ] || die '"nvm_version_dir foo" did not error out' - diff --git a/test/fast/Unit tests/nvm_version_greater b/test/fast/Unit tests/nvm_version_greater index 1979327f..2a345ea4 100755 --- a/test/fast/Unit tests/nvm_version_greater +++ b/test/fast/Unit tests/nvm_version_greater @@ -13,4 +13,3 @@ fi if nvm_version_greater 0.10.0 0.10.0; then die '"nvm_version_greater" returned false for the same two versions' fi - diff --git a/test/fast/Unit tests/nvm_version_path b/test/fast/Unit tests/nvm_version_path index 9f205e21..2d4ad789 100755 --- a/test/fast/Unit tests/nvm_version_path +++ b/test/fast/Unit tests/nvm_version_path @@ -12,4 +12,3 @@ EXPECTED_OUTPUT="$NVM_DIR/foo" [ "$(nvm_version_path v0.11.0)" = "$NVM_DIR/v0.11.0" ] || die 'old version has the wrong path' [ "$(nvm_version_path v0.12.0)" = "$NVM_DIR/versions/node/v0.12.0" ] || die 'new version has the wrong path' [ "$(nvm_version_path iojs-v0.12.0)" = "$NVM_DIR/versions/io.js/v0.12.0" ] || die 'iojs version has the wrong path' - diff --git a/test/install_script/nvm_do_install b/test/install_script/nvm_do_install index 249981b5..5fb0d272 100755 --- a/test/install_script/nvm_do_install +++ b/test/install_script/nvm_do_install @@ -6,4 +6,3 @@ NVM_ENV=testing \. ../../install.sh #nvm_do_install is available type nvm_do_install > /dev/null 2>&1 || die 'nvm_do_install is not available' - diff --git a/test/install_script/nvm_install_dir b/test/install_script/nvm_install_dir index 1c685e3a..ad43f9f9 100755 --- a/test/install_script/nvm_install_dir +++ b/test/install_script/nvm_install_dir @@ -22,4 +22,3 @@ install_dir=$(nvm_install_dir) [ "_$install_dir" = "_$HOME/.nvm" ] || die "nvm_install_dir should default to \$HOME/.nvm. Current output: $install_dir" cleanup - diff --git a/test/install_script/nvm_install_with_aliased_dot b/test/install_script/nvm_install_with_aliased_dot index bc8953a8..b8f05a51 100755 --- a/test/install_script/nvm_install_with_aliased_dot +++ b/test/install_script/nvm_install_with_aliased_dot @@ -20,4 +20,3 @@ nvm_do_install > /dev/null 2>&1 command -v nvm || die 'nvm could not be loaded' cleanup - diff --git a/test/install_script/nvm_reset b/test/install_script/nvm_reset index 6c9f0a99..77bac0a4 100755 --- a/test/install_script/nvm_reset +++ b/test/install_script/nvm_reset @@ -36,4 +36,3 @@ nvm_reset || die 'nvm_reset failed' ! safe_type nvm_detect_profile || die 'nvm_detect_profile is still available' cleanup - diff --git a/test/install_script/nvm_source b/test/install_script/nvm_source index 0e7519d0..3d2205c5 100755 --- a/test/install_script/nvm_source +++ b/test/install_script/nvm_source @@ -37,4 +37,3 @@ out=$(nvm_source "anything") [ "_$out" = "_my_location" ] || die "nvm_source script should have returned \$NVM_SOURCE. Got \"$out\"" cleanup - diff --git a/test/installation_iojs/setup_dir b/test/installation_iojs/setup_dir index 50dc4e42..cb4522d1 100755 --- a/test/installation_iojs/setup_dir +++ b/test/installation_iojs/setup_dir @@ -3,4 +3,3 @@ if [ -f ".nvmrc" ]; then mv .nvmrc .nvmrc.bak fi - diff --git a/test/installation_iojs/teardown_dir b/test/installation_iojs/teardown_dir index 2eda91f9..2ca9cf11 100755 --- a/test/installation_iojs/teardown_dir +++ b/test/installation_iojs/teardown_dir @@ -14,4 +14,3 @@ fi if [ -f ".nvmrc.bak" ]; then mv .nvmrc.bak .nvmrc fi - diff --git a/test/installation_node/install from source implicitly b/test/installation_node/install from source implicitly index 33f55662..a07efc74 100755 --- a/test/installation_node/install from source implicitly +++ b/test/installation_node/install from source implicitly @@ -21,4 +21,3 @@ nvm install $NVM_TEST_VERSION || die "'nvm install -s $NVM_TEST_VERSION' failed" # Check [ -d ../../$NVM_TEST_VERSION ] nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION || "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed" - diff --git a/test/installation_node/install hook b/test/installation_node/install hook index bf3b14ae..896037b9 100755 --- a/test/installation_node/install hook +++ b/test/installation_node/install hook @@ -37,5 +37,3 @@ ${USE_OUTPUT} failed" [ "${OUTPUT}" = "${EXPECTED_OUTPUT}" ] || die "expected >${EXPECTED_OUTPUT}<; got >${OUTPUT}<" - - diff --git a/test/installation_node/install version specified in .nvmrc from binary b/test/installation_node/install version specified in .nvmrc from binary index b230b17a..0c90c999 100755 --- a/test/installation_node/install version specified in .nvmrc from binary +++ b/test/installation_node/install version specified in .nvmrc from binary @@ -18,5 +18,3 @@ nvm install || die "'nvm install' failed" [ -d ../../$NVM_TEST_VERSION ] || die "./$NVM_TEST_VERSION did not exist" nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION \ || "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed" - - diff --git a/test/installation_node/install version specified in .nvmrc from source b/test/installation_node/install version specified in .nvmrc from source index 8f460c7b..85ede4d0 100755 --- a/test/installation_node/install version specified in .nvmrc from source +++ b/test/installation_node/install version specified in .nvmrc from source @@ -18,5 +18,3 @@ nvm install -s || "'nvm install -s' failed" [ -d ../../$NVM_TEST_VERSION ] || die "$NVM_TEST_VERSION did not exist" nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION \ || die "'nvm run $NVM_TEST_VERSION --version | grep $NVM_TEST_VERSION' failed" - - diff --git a/test/installation_node/setup_dir b/test/installation_node/setup_dir index 50dc4e42..cb4522d1 100755 --- a/test/installation_node/setup_dir +++ b/test/installation_node/setup_dir @@ -3,4 +3,3 @@ if [ -f ".nvmrc" ]; then mv .nvmrc .nvmrc.bak fi - diff --git a/test/installation_node/teardown_dir b/test/installation_node/teardown_dir index 5f1d6ce7..2aad1204 100755 --- a/test/installation_node/teardown_dir +++ b/test/installation_node/teardown_dir @@ -12,4 +12,3 @@ fi if [ -f ".nvmrc.bak" ]; then mv .nvmrc.bak .nvmrc fi - diff --git a/test/slow/node 0.6.21 should install 0.6.21-pre b/test/slow/node 0.6.21 should install 0.6.21-pre index 7e68a267..f326adde 100755 --- a/test/slow/node 0.6.21 should install 0.6.21-pre +++ b/test/slow/node 0.6.21 should install 0.6.21-pre @@ -9,4 +9,3 @@ die () { echo "$@" ; exit 1; } nvm install 0.6.21 || die 'v0.6.21 installation failed' [ "_$(node -v)" = "_v0.6.21-pre" ] || die "v0.6.21-pre not installed with v0.6.21, got $(node -v)" [ "_$(nvm current)" = "_v0.6.21" ] || die "v0.6.21-pre not reported as v0.6.21, got $(nvm current)" - diff --git "a/test/slow/nvm exec/Preamble works and respects \"silent\" flag" "b/test/slow/nvm exec/Preamble works and respects \"silent\" flag" index c8c67a41..08d0410e 100755 --- "a/test/slow/nvm exec/Preamble works and respects \"silent\" flag" +++ "b/test/slow/nvm exec/Preamble works and respects \"silent\" flag" @@ -28,4 +28,3 @@ ${NPM_VERSION_ONE}" OUTPUT="$(nvm exec --silent 1 npm --version | head -1)" EXPECTED_OUTPUT="${NPM_VERSION_ONE}" [ "$OUTPUT" = "$EXPECTED_OUTPUT" ] || die "\`nvm exec --silent\` failed to suppress io.js preamble; expected '$EXPECTED_OUTPUT', got '$OUTPUT'" - diff --git "a/test/slow/nvm exec/Running \"nvm exec\" should pick up .nvmrc version" "b/test/slow/nvm exec/Running \"nvm exec\" should pick up .nvmrc version" index 60624643..8d3dcaee 100755 --- "a/test/slow/nvm exec/Running \"nvm exec\" should pick up .nvmrc version" +++ "b/test/slow/nvm exec/Running \"nvm exec\" should pick up .nvmrc version" @@ -14,4 +14,3 @@ echo "0.10.7" > .nvmrc [ "$(nvm exec npm --version | tail -1)" = "$NPM_VERSION_TEN" ] || die "\`nvm exec\` failed to run with the .nvmrc version" [ "$(nvm exec npm --version | head -1)" = "Found '$PWD/.nvmrc' with version <0.10.7>" ] || die "\`nvm exec\` failed to print out the \"found in .nvmrc\" message" - diff --git a/test/slow/nvm exec/setup_dir b/test/slow/nvm exec/setup_dir index e7853d8a..79217427 100755 --- a/test/slow/nvm exec/setup_dir +++ b/test/slow/nvm exec/setup_dir @@ -8,4 +8,3 @@ nvm install --lts if [ -f ".nvmrc" ]; then mv .nvmrc .nvmrc.bak fi - diff --git a/test/slow/nvm exec/teardown_dir b/test/slow/nvm exec/teardown_dir index ab6c7fce..b16b4169 100755 --- a/test/slow/nvm exec/teardown_dir +++ b/test/slow/nvm exec/teardown_dir @@ -11,4 +11,3 @@ rm .nvmrc if [ -f ".nvmrc.bak" ]; then mv .nvmrc.bak .nvmrc fi - diff --git "a/test/slow/nvm reinstall-packages/Running \"nvm copy-packages $(nvm ls current)\" should error out" "b/test/slow/nvm reinstall-packages/Running \"nvm copy-packages $(nvm ls current)\" should error out" index c0f59f22..d5f8571e 100755 --- "a/test/slow/nvm reinstall-packages/Running \"nvm copy-packages $(nvm ls current)\" should error out" +++ "b/test/slow/nvm reinstall-packages/Running \"nvm copy-packages $(nvm ls current)\" should error out" @@ -15,4 +15,3 @@ ACTUAL_MSG="$(nvm reinstall-packages 0.10.28 2>&1 > /dev/null)" EXPECTED_ERROR_CODE="2" ACTUAL_ERROR_CODE="$(nvm reinstall-packages 0.10.28 > /dev/null 2>&1 ; echo $?)" [ "~$ACTUAL_ERROR_CODE" = "~$EXPECTED_ERROR_CODE" ] || die "'nvm use 0.10.28 && nvm reinstall-packages 0.10.28' did not fail with the right error code: expected '$EXPECTED_ERROR_CODE', got '$ACTUAL_ERROR_CODE'" - diff --git a/test/slow/nvm reinstall-packages/setup_dir b/test/slow/nvm reinstall-packages/setup_dir index 7648954b..a959f84c 100755 --- a/test/slow/nvm reinstall-packages/setup_dir +++ b/test/slow/nvm reinstall-packages/setup_dir @@ -7,4 +7,3 @@ nvm install 0.10.29 if [ -f ".nvmrc" ]; then mv .nvmrc .nvmrc.bak fi - diff --git a/test/slow/nvm reinstall-packages/teardown_dir b/test/slow/nvm reinstall-packages/teardown_dir index 13ea150b..bd93f00b 100755 --- a/test/slow/nvm reinstall-packages/teardown_dir +++ b/test/slow/nvm reinstall-packages/teardown_dir @@ -9,4 +9,3 @@ rm -f .nvmrc if [ -f ".nvmrc.bak" ]; then mv .nvmrc.bak .nvmrc fi - diff --git "a/test/slow/nvm run/Running \"nvm run --harmony --version\" should work" "b/test/slow/nvm run/Running \"nvm run --harmony --version\" should work" index 4e2f18b9..28912d15 100755 --- "a/test/slow/nvm run/Running \"nvm run --harmony --version\" should work" +++ "b/test/slow/nvm run/Running \"nvm run --harmony --version\" should work" @@ -6,4 +6,3 @@ die () { echo "$@" ; exit 1; } nvm run 0.10.7 --harmony --version [ "_$(nvm run 0.10.7 --harmony --version 2>/dev/null | tail -1)" = "_v0.10.7" ] || die "\`nvm run --harmony --version\` failed to run with the correct version" - diff --git "a/test/slow/nvm run/Running \"nvm run 0.x\" should work" "b/test/slow/nvm run/Running \"nvm run 0.x\" should work" index ce26349c..d537d4a1 100755 --- "a/test/slow/nvm run/Running \"nvm run 0.x\" should work" +++ "b/test/slow/nvm run/Running \"nvm run 0.x\" should work" @@ -6,4 +6,3 @@ die () { echo "$@" ; exit 1; } \. ../../../nvm.sh [ "$(nvm run 0.10.7 --version | tail -1)" = "v0.10.7" ] || die "\`nvm run\` failed to run with the correct version" - diff --git "a/test/slow/nvm run/Running \"nvm run\" should pick up .nvmrc version" "b/test/slow/nvm run/Running \"nvm run\" should pick up .nvmrc version" index c3cb81e4..3273ea04 100755 --- "a/test/slow/nvm run/Running \"nvm run\" should pick up .nvmrc version" +++ "b/test/slow/nvm run/Running \"nvm run\" should pick up .nvmrc version" @@ -10,4 +10,3 @@ echo "0.10.7" > .nvmrc [ "$(nvm run --version | tail -1)" = "v0.10.7" ] || die "\`nvm run\` failed to run with the .nvmrc version" [ "$(nvm run --version | head -1)" = "Found '$PWD/.nvmrc' with version <0.10.7>" ] || die "\`nvm run\` failed to print out the \"found in .nvmrc\" message" - diff --git a/test/slow/nvm run/setup_dir b/test/slow/nvm run/setup_dir index 481be49c..0fde4d4b 100755 --- a/test/slow/nvm run/setup_dir +++ b/test/slow/nvm run/setup_dir @@ -9,4 +9,3 @@ nvm install --lts if [ -f ".nvmrc" ]; then mv .nvmrc .nvmrc.bak fi - diff --git a/test/slow/nvm run/teardown_dir b/test/slow/nvm run/teardown_dir index d3274c8d..53e2838a 100755 --- a/test/slow/nvm run/teardown_dir +++ b/test/slow/nvm run/teardown_dir @@ -12,4 +12,3 @@ rm .nvmrc if [ -f ".nvmrc.bak" ]; then mv .nvmrc.bak .nvmrc fi - diff --git a/test/slow/nvm_get_latest/nvm_get_latest b/test/slow/nvm_get_latest/nvm_get_latest index 306d371d..67345e33 100755 --- a/test/slow/nvm_get_latest/nvm_get_latest +++ b/test/slow/nvm_get_latest/nvm_get_latest @@ -119,4 +119,3 @@ EXIT_CODE="$(nvm_get_latest >/dev/null 2>&1 ; echo $?)" cleanup - diff --git a/test/slow/nvm_get_latest/nvm_get_latest failed redirect b/test/slow/nvm_get_latest/nvm_get_latest failed redirect index e8ee63a7..97534e9e 100755 --- a/test/slow/nvm_get_latest/nvm_get_latest failed redirect +++ b/test/slow/nvm_get_latest/nvm_get_latest failed redirect @@ -23,4 +23,3 @@ EXIT_CODE="$(nvm_get_latest >/dev/null 2>&1 ; echo $?)" || die "failed redirect did not exit with code 2, got $EXIT_CODE" cleanup - diff --git a/test/sourcing/Sourcing nvm.sh should use the default if available b/test/sourcing/Sourcing nvm.sh should use the default if available index e77edf17..67e30485 100755 --- a/test/sourcing/Sourcing nvm.sh should use the default if available +++ b/test/sourcing/Sourcing nvm.sh should use the default if available @@ -15,4 +15,3 @@ NVM_LS_CURRENT="$(nvm ls current | strip_colors | \grep -o v0.10.1)" NVM_ALIAS_DEFAULT="$(nvm alias default | strip_colors)" [ "_$NVM_ALIAS_DEFAULT" = "_default -> 0.10.1 (-> v0.10.1)" ] \ || die "'nvm alias default did not return 'default -> 0.10.1 (-> v0.10.1)', got '$NVM_ALIAS_DEFAULT'" - diff --git a/test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it b/test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it index 7510c886..35ed5534 100755 --- a/test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it +++ b/test/sourcing/Sourcing nvm.sh with --install and .nvmrc should install it @@ -25,4 +25,3 @@ nvm_version 0.10.2 >/dev/null 2>&1 || die "v0.10.2 not installed: $(nvm ls)" NVM_LS_CURRENT="$(nvm ls current | \grep -o v0.10.2)" [ "_$NVM_LS_CURRENT" = '_v0.10.2' ] || die "'nvm ls current' did not return '-> v0.10.2', got '$NVM_LS_CURRENT' `nvm ls`" - diff --git a/test/sourcing/Sourcing nvm.sh with --install should install the default b/test/sourcing/Sourcing nvm.sh with --install should install the default index d23f32a9..8791455c 100755 --- a/test/sourcing/Sourcing nvm.sh with --install should install the default +++ b/test/sourcing/Sourcing nvm.sh with --install should install the default @@ -30,4 +30,3 @@ NVM_LS_CURRENT="$(nvm ls current | strip_colors | command grep -o v0.10.2)" NVM_ALIAS_DEFAULT="$(nvm alias default | strip_colors)" [ "_$NVM_ALIAS_DEFAULT" = "_default -> 0.10.2 (-> v0.10.2)" ] \ || die "'nvm alias default did not return 'default -> 0.10.2 (-> v0.10.2)', got '$NVM_ALIAS_DEFAULT'" - diff --git a/test/sourcing/Sourcing nvm.sh with --no-use should not use anything b/test/sourcing/Sourcing nvm.sh with --no-use should not use anything index 2b409094..5b98d4b2 100755 --- a/test/sourcing/Sourcing nvm.sh with --no-use should not use anything +++ b/test/sourcing/Sourcing nvm.sh with --no-use should not use anything @@ -29,4 +29,3 @@ echo 'sourcing complete.' NVM_CURRENT="$(nvm current)" [ "_$NVM_CURRENT" = '_none' ] || [ "_$NVM_CURRENT" = '_system' ] || die "'nvm current' did not return 'none' or 'system', got '$NVM_CURRENT' `nvm ls`" - diff --git a/test/sourcing/setup b/test/sourcing/setup index c87df100..44b688e4 100755 --- a/test/sourcing/setup +++ b/test/sourcing/setup @@ -11,4 +11,3 @@ rm -rf ../../v0.9.12 nvm install 0.10.1 || echo >&2 'nvm install 0.10.1 failed' nvm unalias default || 'removing default alias failed' nvm unload || echo >&2 'nvm unload failed' - diff --git a/test/sourcing/teardown b/test/sourcing/teardown index 6a314722..00a87495 100755 --- a/test/sourcing/teardown +++ b/test/sourcing/teardown @@ -4,4 +4,3 @@ rm -rf ../../alias rm -rf ../../v0.10.1 rm -rf ../../v0.10.2 rm -f ../../.nvmrc -