diff --git a/nvm-exec b/nvm-exec index 0d288709..55ea0c13 100755 --- a/nvm-exec +++ b/nvm-exec @@ -2,7 +2,7 @@ DIR="$(command cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -. "$DIR/nvm.sh" --no-use +\. "$DIR/nvm.sh" --no-use if [ -n "$NODE_VERSION" ]; then nvm use $NODE_VERSION > /dev/null || exit 127 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 f5b1d0fd..0c2869e5 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" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh die () { echo $@ ; exit 1; } 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 ff0a3045..ac399dee 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" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh die () { echo $@ ; exit 1; } diff --git "a/test/fast/Aliases/Running \"nvm alias \" again should change the target" "b/test/fast/Aliases/Running \"nvm alias \" again should change the target" index 8c8bb68b..bd57bc6d 100755 --- "a/test/fast/Aliases/Running \"nvm alias \" again should change the target" +++ "b/test/fast/Aliases/Running \"nvm alias \" again should change the target" @@ -1,7 +1,7 @@ #!/bin/sh -. ../../../nvm.sh -. ../../common.sh +\. ../../../nvm.sh +\. ../../common.sh die () { echo $@ ; exit 1; } diff --git "a/test/fast/Aliases/Running \"nvm alias \" should list but one alias." "b/test/fast/Aliases/Running \"nvm alias \" should list but one alias." index b22df2e3..7ba4c385 100755 --- "a/test/fast/Aliases/Running \"nvm alias \" should list but one alias." +++ "b/test/fast/Aliases/Running \"nvm alias \" should list but one alias." @@ -1,4 +1,4 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh [ $(nvm alias test-stable-1 | wc -l) = '2' ] 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 2c27ad15..1df6638d 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" @@ -1,7 +1,7 @@ #!/bin/sh -. ../../../nvm.sh -. ../../common.sh +\. ../../../nvm.sh +\. ../../common.sh die () { echo $@ ; exit 1; } diff --git "a/test/fast/Aliases/Running \"nvm alias\" lists manual aliases instead of implicit aliases when present" "b/test/fast/Aliases/Running \"nvm alias\" lists manual aliases instead of implicit aliases when present" index 050baf66..e6babc64 100755 --- "a/test/fast/Aliases/Running \"nvm alias\" lists manual aliases instead of implicit aliases when present" +++ "b/test/fast/Aliases/Running \"nvm alias\" lists manual aliases instead of implicit aliases when present" @@ -1,7 +1,7 @@ #!/bin/sh -. ../../../nvm.sh -. ../../common.sh +\. ../../../nvm.sh +\. ../../common.sh die () { echo $@ ; cleanup ; exit 1; } cleanup () { diff --git "a/test/fast/Aliases/Running \"nvm alias\" should list all aliases." "b/test/fast/Aliases/Running \"nvm alias\" should list all aliases." index 11353880..5223e098 100755 --- "a/test/fast/Aliases/Running \"nvm alias\" should list all aliases." +++ "b/test/fast/Aliases/Running \"nvm alias\" should list all aliases." @@ -1,7 +1,7 @@ #!/bin/sh -. ../../../nvm.sh -. ../../common.sh +\. ../../../nvm.sh +\. ../../common.sh die () { echo $@ ; exit 1; } diff --git a/test/fast/Aliases/circular/nvm_resolve_alias b/test/fast/Aliases/circular/nvm_resolve_alias index e4818264..af351a58 100755 --- a/test/fast/Aliases/circular/nvm_resolve_alias +++ b/test/fast/Aliases/circular/nvm_resolve_alias @@ -1,9 +1,9 @@ #!/bin/sh -. ../../../common.sh +\. ../../../common.sh die () { echo $@ ; exit 1; } -. ../../../../nvm.sh +\. ../../../../nvm.sh ALIAS="$(nvm_resolve_alias loopback | strip_colors)" [ "_$ALIAS" = "_∞" ] || die "nvm_resolve_alias loopback was not ∞; got $ALIAS" diff --git a/test/fast/Aliases/circular/nvm_resolve_local_alias b/test/fast/Aliases/circular/nvm_resolve_local_alias index dace4d0a..631acdaa 100755 --- a/test/fast/Aliases/circular/nvm_resolve_local_alias +++ b/test/fast/Aliases/circular/nvm_resolve_local_alias @@ -1,9 +1,9 @@ #!/bin/sh -. ../../../common.sh +\. ../../../common.sh die () { echo $@ ; exit 1; } -. ../../../../nvm.sh +\. ../../../../nvm.sh ALIAS="$(nvm_resolve_local_alias loopback | strip_colors)" [ "_$ALIAS" = "_∞" ] || die "nvm_resolve_local_alias loopback was not ∞; got $ALIAS" diff --git "a/test/fast/Aliases/lts/\"nvm alias\" should ensure LTS alias dir exists" "b/test/fast/Aliases/lts/\"nvm alias\" should ensure LTS alias dir exists" index eefcf980..0a1d9095 100755 --- "a/test/fast/Aliases/lts/\"nvm alias\" should ensure LTS alias dir exists" +++ "b/test/fast/Aliases/lts/\"nvm alias\" should ensure LTS alias dir exists" @@ -2,8 +2,8 @@ set -ex -. ../../../../nvm.sh -. ../../../common.sh +\. ../../../../nvm.sh +\. ../../../common.sh LTS_ALIAS_PATH="$(nvm_alias_path)/lts" diff --git a/test/fast/Aliases/lts/setup_dir b/test/fast/Aliases/lts/setup_dir index 6a99acfd..4aeb0675 100755 --- a/test/fast/Aliases/lts/setup_dir +++ b/test/fast/Aliases/lts/setup_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../../nvm.sh +\. ../../../../nvm.sh LTS_ALIAS_PATH="$(nvm_alias_path)/lts" diff --git a/test/fast/Aliases/lts/teardown_dir b/test/fast/Aliases/lts/teardown_dir index a5200efd..18863f44 100755 --- a/test/fast/Aliases/lts/teardown_dir +++ b/test/fast/Aliases/lts/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../../nvm.sh +\. ../../../../nvm.sh LTS_ALIAS_PATH="$(nvm_alias_path)/lts" diff --git a/test/fast/Aliases/nvm_ensure_default_set b/test/fast/Aliases/nvm_ensure_default_set index 602ceba0..34f08a34 100755 --- a/test/fast/Aliases/nvm_ensure_default_set +++ b/test/fast/Aliases/nvm_ensure_default_set @@ -1,10 +1,10 @@ #!/bin/sh -. ../../common.sh +\. ../../common.sh die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm alias default 0.1 >/dev/null || die "'nvm alias default 0.1' failed" diff --git a/test/fast/Aliases/nvm_resolve_alias b/test/fast/Aliases/nvm_resolve_alias index f367eb3e..837f0a23 100755 --- a/test/fast/Aliases/nvm_resolve_alias +++ b/test/fast/Aliases/nvm_resolve_alias @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh EXIT_CODE=$(nvm_resolve_alias ; echo $?) [ $EXIT_CODE = "1" ] || die "nvm_resolve_alias without an argument did not return 1; got $EXIT_CODE" diff --git a/test/fast/Aliases/nvm_resolve_local_alias b/test/fast/Aliases/nvm_resolve_local_alias index 384fece8..f0d40bde 100755 --- a/test/fast/Aliases/nvm_resolve_local_alias +++ b/test/fast/Aliases/nvm_resolve_local_alias @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh EXIT_CODE=$(nvm_resolve_local_alias ; echo $?) [ "_$EXIT_CODE" = "_1" ] || die "nvm_resolve_local_alias without an argument did not return 1; got $EXIT_CODE" diff --git "a/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2." "b/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2." index 3ead43e3..05e8f257 100755 --- "a/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2." +++ "b/test/fast/Listing paths/Running \"nvm which 0.0.2\" should display only version 0.0.2." @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p "${NVM_DIR}/v0.0.2" mkdir -p "${NVM_DIR}/v0.0.20" diff --git "a/test/fast/Listing paths/Running \"nvm which foo\" should return a nonzero exit code when not found" "b/test/fast/Listing paths/Running \"nvm which foo\" should return a nonzero exit code when not found" index 0c1e30bc..c0218a0c 100755 --- "a/test/fast/Listing paths/Running \"nvm which foo\" should return a nonzero exit code when not found" +++ "b/test/fast/Listing paths/Running \"nvm which foo\" should return a nonzero exit code when not found" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm which nonexistent_version [ "_$?" = "_1" ] diff --git "a/test/fast/Listing versions/Running \"nvm ls 0.0.2\" should display only version 0.0.2." "b/test/fast/Listing versions/Running \"nvm ls 0.0.2\" should display only version 0.0.2." index 92c59bca..fc738887 100755 --- "a/test/fast/Listing versions/Running \"nvm ls 0.0.2\" should display only version 0.0.2." +++ "b/test/fast/Listing versions/Running \"nvm ls 0.0.2\" should display only version 0.0.2." @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/v0.0.2" mkdir "${NVM_DIR}/v0.0.20" diff --git "a/test/fast/Listing versions/Running \"nvm ls 0.2\" should display only 0.2.x versions." "b/test/fast/Listing versions/Running \"nvm ls 0.2\" should display only 0.2.x versions." index 8a6630d1..0d06a24e 100755 --- "a/test/fast/Listing versions/Running \"nvm ls 0.2\" should display only 0.2.x versions." +++ "b/test/fast/Listing versions/Running \"nvm ls 0.2\" should display only 0.2.x versions." @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/v0.1.3" mkdir "${NVM_DIR}/v0.2.3" diff --git "a/test/fast/Listing versions/Running \"nvm ls foo\" should return a nonzero exit code when not found" "b/test/fast/Listing versions/Running \"nvm ls foo\" should return a nonzero exit code when not found" index 19e0f967..74a97b48 100755 --- "a/test/fast/Listing versions/Running \"nvm ls foo\" should return a nonzero exit code when not found" +++ "b/test/fast/Listing versions/Running \"nvm ls foo\" should return a nonzero exit code when not found" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm ls nonexistent_version [ "$?" = "3" ] diff --git "a/test/fast/Listing versions/Running \"nvm ls io\" should return NA" "b/test/fast/Listing versions/Running \"nvm ls io\" should return NA" index 2c61b66a..79dccfe5 100755 --- "a/test/fast/Listing versions/Running \"nvm ls io\" should return NA" +++ "b/test/fast/Listing versions/Running \"nvm ls io\" should return NA" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm ls io [ "$?" = "3" ] diff --git "a/test/fast/Listing versions/Running \"nvm ls node_\" should return a nonzero exit code when not found" "b/test/fast/Listing versions/Running \"nvm ls node_\" should return a nonzero exit code when not found" index b4ad7a2a..af79302c 100755 --- "a/test/fast/Listing versions/Running \"nvm ls node_\" should return a nonzero exit code when not found" +++ "b/test/fast/Listing versions/Running \"nvm ls node_\" should return a nonzero exit code when not found" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm ls node_ [ "$?" = "3" ] diff --git "a/test/fast/Listing versions/Running \"nvm ls stable\" and \"nvm ls unstable\" should return the appropriate implicit alias" "b/test/fast/Listing versions/Running \"nvm ls stable\" and \"nvm ls unstable\" should return the appropriate implicit alias" index 195f1974..c6347991 100755 --- "a/test/fast/Listing versions/Running \"nvm ls stable\" and \"nvm ls unstable\" should return the appropriate implicit alias" +++ "b/test/fast/Listing versions/Running \"nvm ls stable\" and \"nvm ls unstable\" should return the appropriate implicit alias" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh die () { echo $@ ; exit 1; } diff --git "a/test/fast/Listing versions/Running \"nvm ls system\" should include \"system\" when appropriate" "b/test/fast/Listing versions/Running \"nvm ls system\" should include \"system\" when appropriate" index 16b43083..a570777b 100755 --- "a/test/fast/Listing versions/Running \"nvm ls system\" should include \"system\" when appropriate" +++ "b/test/fast/Listing versions/Running \"nvm ls system\" should include \"system\" when appropriate" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p "${NVM_DIR}/v0.0.1" mkdir -p "${NVM_DIR}/v0.0.3" diff --git "a/test/fast/Listing versions/Running \"nvm ls\" should display all installed versions." "b/test/fast/Listing versions/Running \"nvm ls\" should display all installed versions." index d8ee316e..d9fdce0e 100755 --- "a/test/fast/Listing versions/Running \"nvm ls\" should display all installed versions." +++ "b/test/fast/Listing versions/Running \"nvm ls\" should display all installed versions." @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/v0.0.1" mkdir "${NVM_DIR}/v0.0.3" diff --git "a/test/fast/Listing versions/Running \"nvm ls\" should filter out \".nvm\"" "b/test/fast/Listing versions/Running \"nvm ls\" should filter out \".nvm\"" index a1d1f5ba..2946ad8e 100755 --- "a/test/fast/Listing versions/Running \"nvm ls\" should filter out \".nvm\"" +++ "b/test/fast/Listing versions/Running \"nvm ls\" should filter out \".nvm\"" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/v0.1.3" mkdir "${NVM_DIR}/v0.2.3" diff --git "a/test/fast/Listing versions/Running \"nvm ls\" should filter out \"versions\"" "b/test/fast/Listing versions/Running \"nvm ls\" should filter out \"versions\"" index 1e8183e4..eae526ae 100755 --- "a/test/fast/Listing versions/Running \"nvm ls\" should filter out \"versions\"" +++ "b/test/fast/Listing versions/Running \"nvm ls\" should filter out \"versions\"" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/v0.1.3" mkdir "${NVM_DIR}/v0.2.3" diff --git "a/test/fast/Listing versions/Running \"nvm ls\" should include \"system\" when appropriate" "b/test/fast/Listing versions/Running \"nvm ls\" should include \"system\" when appropriate" index a5a55145..bfd4c554 100755 --- "a/test/fast/Listing versions/Running \"nvm ls\" should include \"system\" when appropriate" +++ "b/test/fast/Listing versions/Running \"nvm ls\" should include \"system\" when appropriate" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p "${NVM_DIR}/v0.0.1" mkdir -p "${NVM_DIR}/v0.0.3" diff --git "a/test/fast/Listing versions/Running \"nvm ls\" should list versions in the \"versions\" directory" "b/test/fast/Listing versions/Running \"nvm ls\" should list versions in the \"versions\" directory" index 62492d26..76225e38 100755 --- "a/test/fast/Listing versions/Running \"nvm ls\" should list versions in the \"versions\" directory" +++ "b/test/fast/Listing versions/Running \"nvm ls\" should list versions in the \"versions\" directory" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p "${NVM_DIR}/versions/node/v0.12.1" mkdir "${NVM_DIR}/v0.1.3" diff --git "a/test/fast/Listing versions/Running \"nvm ls\" with node-like versioning vx.x.x should only list a matched version" "b/test/fast/Listing versions/Running \"nvm ls\" with node-like versioning vx.x.x should only list a matched version" index 24b3db47..2884531f 100755 --- "a/test/fast/Listing versions/Running \"nvm ls\" with node-like versioning vx.x.x should only list a matched version" +++ "b/test/fast/Listing versions/Running \"nvm ls\" with node-like versioning vx.x.x should only list a matched version" @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/v0.1.2" diff --git "a/test/fast/Running \"nvm alias\" should create a file in the alias directory." "b/test/fast/Running \"nvm alias\" should create a file in the alias directory." index 8a466bb6..1ff49f59 100755 --- "a/test/fast/Running \"nvm alias\" should create a file in the alias directory." +++ "b/test/fast/Running \"nvm alias\" should create a file in the alias directory." @@ -2,7 +2,7 @@ set -ex -. ../../nvm.sh +\. ../../nvm.sh nvm alias test v0.1.2 diff --git "a/test/fast/Running \"nvm current\" should display current nvm environment." "b/test/fast/Running \"nvm current\" should display current nvm environment." index db87520d..3c114a6d 100755 --- "a/test/fast/Running \"nvm current\" should display current nvm environment." +++ "b/test/fast/Running \"nvm current\" should display current nvm environment." @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh nvm deactivate 2>&1 diff --git "a/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables." "b/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables." index ba510748..e5fbb6f1 100755 --- "a/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables." +++ "b/test/fast/Running \"nvm deactivate\" should unset the nvm environment variables." @@ -8,7 +8,7 @@ die () { echo $@ ; exit 1; } [ `expr $PATH : ".*v0.2.3/.*/bin"` = 0 ] || echo "WARNING: Unexpectedly found v0.2.3 already active" >&2 -. ../../nvm.sh +\. ../../nvm.sh nvm use --delete-prefix v0.2.3 || die "Failed to activate v0.2.3" [ `expr "$PATH" : ".*v0.2.3/.*/bin"` != 0 ] || die "PATH not set up properly" diff --git "a/test/fast/Running \"nvm install\" with \"--reinstall-packages-from\" requires a valid version" "b/test/fast/Running \"nvm install\" with \"--reinstall-packages-from\" requires a valid version" index f7b016de..ec02cecf 100755 --- "a/test/fast/Running \"nvm install\" with \"--reinstall-packages-from\" requires a valid version" +++ "b/test/fast/Running \"nvm install\" with \"--reinstall-packages-from\" requires a valid version" @@ -7,7 +7,7 @@ cleanup () { rm -rf "${NVM_DIR}/v0.10.4" } -. ../../nvm.sh +\. ../../nvm.sh mkdir "${NVM_DIR}/v0.10.4" diff --git "a/test/fast/Running \"nvm install\" with an invalid version fails nicely" "b/test/fast/Running \"nvm install\" with an invalid version fails nicely" index 3d783404..56b292c3 100755 --- "a/test/fast/Running \"nvm install\" with an invalid version fails nicely" +++ "b/test/fast/Running \"nvm install\" with an invalid version fails nicely" @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh set +ex # needed for stderr OUTPUT="$(nvm install invalid.invalid 2>&1)" diff --git "a/test/fast/Running \"nvm unalias\" should remove the alias file." "b/test/fast/Running \"nvm unalias\" should remove the alias file." index d49ebf29..2781f57a 100755 --- "a/test/fast/Running \"nvm unalias\" should remove the alias file." +++ "b/test/fast/Running \"nvm unalias\" should remove the alias file." @@ -6,7 +6,7 @@ ALIAS_PATH="../../alias" echo v0.1.2 > "${ALIAS_PATH}/test" -. ../../nvm.sh +\. ../../nvm.sh nvm unalias test diff --git "a/test/fast/Running \"nvm unload\" should unset all function and variables." "b/test/fast/Running \"nvm unload\" should unset all function and variables." index 3ac35050..783d23ba 100755 --- "a/test/fast/Running \"nvm unload\" should unset all function and variables." +++ "b/test/fast/Running \"nvm unload\" should unset all function and variables." @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh type nvm > /dev/null 2>&1 || die "nvm not loaded" diff --git "a/test/fast/Running \"nvm use foo\" where \"foo\" is circular aborts" "b/test/fast/Running \"nvm use foo\" where \"foo\" is circular aborts" index 023415cd..a5f20291 100755 --- "a/test/fast/Running \"nvm use foo\" where \"foo\" is circular aborts" +++ "b/test/fast/Running \"nvm use foo\" where \"foo\" is circular aborts" @@ -8,7 +8,7 @@ cleanup() { rm -rf "$(nvm_alias_path)/foo" } -. ../../nvm.sh +\. ../../nvm.sh nvm_make_alias foo foo diff --git "a/test/fast/Running \"nvm use iojs\" uses latest io.js version" "b/test/fast/Running \"nvm use iojs\" uses latest io.js version" index 6c54203f..23355ca7 100755 --- "a/test/fast/Running \"nvm use iojs\" uses latest io.js version" +++ "b/test/fast/Running \"nvm use iojs\" uses latest io.js version" @@ -2,7 +2,7 @@ set -ex -. ../common.sh +\. ../common.sh die () { echo $@ ; cleanup ; exit 1; } @@ -13,7 +13,7 @@ cleanup() { rm -rf "$(nvm_version_path "iojs-${VERSION}")" } -. ../../nvm.sh +\. ../../nvm.sh nvm deactivate || die "unable to deactivate; current: >$(nvm current)<" diff --git "a/test/fast/Running \"nvm use system\" should work as expected" "b/test/fast/Running \"nvm use system\" should work as expected" index 196353d5..9a0c509b 100755 --- "a/test/fast/Running \"nvm use system\" should work as expected" +++ "b/test/fast/Running \"nvm use system\" should work as expected" @@ -7,7 +7,7 @@ cleanup() { } die() { echo $@ ; cleanup ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh nvm_has_system_node() { return 0; } nvm_print_npm_version() { command printf ' (npm v1.2.3)'; } diff --git "a/test/fast/Running \"nvm use x\" should create and change the \"current\" symlink" "b/test/fast/Running \"nvm use x\" should create and change the \"current\" symlink" index e6004974..71f208c7 100755 --- "a/test/fast/Running \"nvm use x\" should create and change the \"current\" symlink" +++ "b/test/fast/Running \"nvm use x\" should create and change the \"current\" symlink" @@ -3,7 +3,7 @@ set -ex export NVM_SYMLINK_CURRENT=true -. ../../nvm.sh +\. ../../nvm.sh rm -rf "${NVM_DIR}/v0.10.29" mkdir "${NVM_DIR}/v0.10.29" diff --git "a/test/fast/Running \"nvm use x\" should not create the \"current\" symlink if $NVM_SYMLINK_CURRENT is false" "b/test/fast/Running \"nvm use x\" should not create the \"current\" symlink if $NVM_SYMLINK_CURRENT is false" index b84ebf4c..be6284d7 100755 --- "a/test/fast/Running \"nvm use x\" should not create the \"current\" symlink if $NVM_SYMLINK_CURRENT is false" +++ "b/test/fast/Running \"nvm use x\" should not create the \"current\" symlink if $NVM_SYMLINK_CURRENT is false" @@ -2,7 +2,7 @@ set -ex -. ../../nvm.sh +\. ../../nvm.sh TEST_NODE_VERSION="v0.10.29" diff --git a/test/fast/Sourcing nvm.sh should make the nvm command available. b/test/fast/Sourcing nvm.sh should make the nvm command available. index 9c215d5e..e74f3475 100755 --- a/test/fast/Sourcing nvm.sh should make the nvm command available. +++ b/test/fast/Sourcing nvm.sh should make the nvm command available. @@ -2,6 +2,6 @@ set -ex -. ../../nvm.sh +\. ../../nvm.sh nvm diff --git a/test/fast/Sourcing nvm.sh should not modify parameters of caller b/test/fast/Sourcing nvm.sh should not modify parameters of caller index cf8b1496..2053b739 100755 --- a/test/fast/Sourcing nvm.sh should not modify parameters of caller +++ b/test/fast/Sourcing nvm.sh should not modify parameters of caller @@ -3,5 +3,5 @@ set -ex set -- yes -. ../../nvm.sh +\. ../../nvm.sh [ "$1" = yes ] diff --git a/test/fast/Unit tests/iojs_version_has_solaris_binary b/test/fast/Unit tests/iojs_version_has_solaris_binary index 7a797cb3..8369ef5f 100755 --- a/test/fast/Unit tests/iojs_version_has_solaris_binary +++ b/test/fast/Unit tests/iojs_version_has_solaris_binary @@ -2,8 +2,8 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh -. ../../common.sh +\. ../../../nvm.sh +\. ../../common.sh assert_not_ok iojs_version_has_solaris_binary "" assert_not_ok iojs_version_has_solaris_binary "foo" diff --git a/test/fast/Unit tests/node_version_has_solaris_binary b/test/fast/Unit tests/node_version_has_solaris_binary index db62d599..2a12fe7a 100755 --- a/test/fast/Unit tests/node_version_has_solaris_binary +++ b/test/fast/Unit tests/node_version_has_solaris_binary @@ -2,8 +2,8 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh -. ../../common.sh +\. ../../../nvm.sh +\. ../../common.sh # Invalid version numbers fail assert_not_ok node_version_has_solaris_binary "" diff --git a/test/fast/Unit tests/nvm ls-remote b/test/fast/Unit tests/nvm ls-remote index 449d4af6..7ef0487d 100755 --- a/test/fast/Unit tests/nvm ls-remote +++ b/test/fast/Unit tests/nvm ls-remote @@ -8,11 +8,11 @@ cleanup() { unset -f nvm_download nvm_ls_remote nvm_ls_remote_iojs } -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate 2>/dev/null || die 'unable to deactivate' -. ../../common.sh +\. ../../common.sh REMOTE="$PWD/mocks/nvm_ls_remote.txt" nvm_ls_remote() { diff --git a/test/fast/Unit tests/nvm version-remote b/test/fast/Unit tests/nvm version-remote index dd587dcb..12ef585c 100755 --- a/test/fast/Unit tests/nvm version-remote +++ b/test/fast/Unit tests/nvm version-remote @@ -8,9 +8,9 @@ cleanup() { unset -f nvm_remote_version } -. ../../../nvm.sh +\. ../../../nvm.sh -. ../../common.sh +\. ../../common.sh nvm_remote_version() { echo "NVM_VERSION_ONLY:${NVM_VERSION_ONLY-},NVM_LTS:${NVM_LTS-},PATTERN:${PATTERN-}" diff --git a/test/fast/Unit tests/nvm_add_iojs_prefix b/test/fast/Unit tests/nvm_add_iojs_prefix index 4a8d1ee1..4ad727ed 100755 --- a/test/fast/Unit tests/nvm_add_iojs_prefix +++ b/test/fast/Unit tests/nvm_add_iojs_prefix @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh [ "_$(nvm_add_iojs_prefix 1)" = "_iojs-v1" ] || die '"nvm_add_iojs_prefix 1" did not return "iojs-v1"' [ "_$(nvm_add_iojs_prefix iojs-1)" = "_iojs-v1" ] || die '"nvm_add_iojs_prefix iojs-1" did not return "iojs-v1"' diff --git a/test/fast/Unit tests/nvm_alias b/test/fast/Unit tests/nvm_alias index f51aac80..6c350f55 100755 --- a/test/fast/Unit tests/nvm_alias +++ b/test/fast/Unit tests/nvm_alias @@ -6,7 +6,7 @@ cleanup () { rm -rf ../../../alias/test } -. ../../../nvm.sh +\. ../../../nvm.sh OUTPUT="$(nvm_alias 2>&1)" EXPECTED_OUTPUT='An alias is required.' diff --git a/test/fast/Unit tests/nvm_alias_path b/test/fast/Unit tests/nvm_alias_path index 0766e2ae..aaf7b1f0 100755 --- a/test/fast/Unit tests/nvm_alias_path +++ b/test/fast/Unit tests/nvm_alias_path @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../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_checksum b/test/fast/Unit tests/nvm_checksum index 73cf1f1f..20757337 100755 --- a/test/fast/Unit tests/nvm_checksum +++ b/test/fast/Unit tests/nvm_checksum @@ -6,7 +6,7 @@ cleanup () { } die () { echo $@ ; cleanup; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p tmp touch tmp/emptyfile diff --git a/test/fast/Unit tests/nvm_compare_checksum b/test/fast/Unit tests/nvm_compare_checksum index e74adb1e..d9ddc6d6 100755 --- a/test/fast/Unit tests/nvm_compare_checksum +++ b/test/fast/Unit tests/nvm_compare_checksum @@ -5,7 +5,7 @@ cleanup () { } die () { echo $@ ; cleanup ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_compute_checksum b/test/fast/Unit tests/nvm_compute_checksum index 2684c4ca..1ca5cce1 100755 --- a/test/fast/Unit tests/nvm_compute_checksum +++ b/test/fast/Unit tests/nvm_compute_checksum @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh set +x OUTPUT="$(nvm_compute_checksum 2>&1 >/dev/null || echo)" diff --git a/test/fast/Unit tests/nvm_die_on_prefix b/test/fast/Unit tests/nvm_die_on_prefix index de14deb6..67dfe502 100755 --- a/test/fast/Unit tests/nvm_die_on_prefix +++ b/test/fast/Unit tests/nvm_die_on_prefix @@ -7,7 +7,7 @@ cleanup () { } die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh OUTPUT="$(nvm_die_on_prefix 2>&1)" EXPECTED_OUTPUT="First argument \"delete the prefix\" must be zero or one" diff --git a/test/fast/Unit tests/nvm_ensure_default_set b/test/fast/Unit tests/nvm_ensure_default_set index fb0461b9..8a40891e 100755 --- a/test/fast/Unit tests/nvm_ensure_default_set +++ b/test/fast/Unit tests/nvm_ensure_default_set @@ -1,10 +1,10 @@ #!/bin/sh -. ../../common.sh +\. ../../common.sh die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh EXPECTED_OUTPUT="nvm_ensure_default_set: a version is required" OUTPUT="$(nvm_ensure_default_set 2>&1 >/dev/null)" diff --git a/test/fast/Unit tests/nvm_ensure_version_installed b/test/fast/Unit tests/nvm_ensure_version_installed index 7c49aafc..f96d9bd2 100755 --- a/test/fast/Unit tests/nvm_ensure_version_installed +++ b/test/fast/Unit tests/nvm_ensure_version_installed @@ -5,7 +5,7 @@ cleanup () { rm -rf "$(nvm_version_path v0.1.2)" } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p "$(nvm_version_path v0.1.2)" diff --git a/test/fast/Unit tests/nvm_ensure_version_prefix b/test/fast/Unit tests/nvm_ensure_version_prefix index 184ddea8..08ed4a80 100755 --- a/test/fast/Unit tests/nvm_ensure_version_prefix +++ b/test/fast/Unit tests/nvm_ensure_version_prefix @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh [ "_$(nvm_ensure_version_prefix 1)" = "_v1" ] || die '"nvm_ensure_version_prefix 1" did not return "v1"' [ "_$(nvm_ensure_version_prefix v1)" = "_v1" ] || die '"nvm_ensure_version_prefix v1" did not return "v1"' diff --git a/test/fast/Unit tests/nvm_find_up b/test/fast/Unit tests/nvm_find_up index 39fb5687..f035d06d 100755 --- a/test/fast/Unit tests/nvm_find_up +++ b/test/fast/Unit tests/nvm_find_up @@ -11,7 +11,7 @@ cleanup () { rm -rf tmp_nvm_find_up } -. ../../../nvm.sh +\. ../../../nvm.sh setup diff --git a/test/fast/Unit tests/nvm_format_version b/test/fast/Unit tests/nvm_format_version index e77b3da7..1a2396a7 100755 --- a/test/fast/Unit tests/nvm_format_version +++ b/test/fast/Unit tests/nvm_format_version @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh INPUT="0.1.2" OUTPUT="$(nvm_format_version "$INPUT")" diff --git a/test/fast/Unit tests/nvm_get_arch b/test/fast/Unit tests/nvm_get_arch index 102c9da7..db199067 100755 --- a/test/fast/Unit tests/nvm_get_arch +++ b/test/fast/Unit tests/nvm_get_arch @@ -11,7 +11,7 @@ cleanup() { die () { cleanup; echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh # Directory where mocked binaries used by nvm_get_arch for each OS/arch are # located diff --git a/test/fast/Unit tests/nvm_get_checksum b/test/fast/Unit tests/nvm_get_checksum index 1ac88686..d842b143 100755 --- a/test/fast/Unit tests/nvm_get_checksum +++ b/test/fast/Unit tests/nvm_get_checksum @@ -8,7 +8,7 @@ cleanup () { die () { echo $@ ; cleanup ; exit 1; } set +e # TODO: fix -. ../../../nvm.sh +\. ../../../nvm.sh set -e nvm_get_mirror() { diff --git a/test/fast/Unit tests/nvm_get_checksum_alg b/test/fast/Unit tests/nvm_get_checksum_alg index e794595f..e26ca44b 100755 --- a/test/fast/Unit tests/nvm_get_checksum_alg +++ b/test/fast/Unit tests/nvm_get_checksum_alg @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh ALG="$(nvm_get_checksum_alg)" diff --git a/test/fast/Unit tests/nvm_get_latest missing curl or wget b/test/fast/Unit tests/nvm_get_latest missing curl or wget index 1ad960a8..5fede18f 100755 --- a/test/fast/Unit tests/nvm_get_latest missing curl or wget +++ b/test/fast/Unit tests/nvm_get_latest missing curl or wget @@ -6,7 +6,7 @@ cleanup() { unset -f nvm_has } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_has() { return 1 ; } diff --git a/test/fast/Unit tests/nvm_get_minor_version b/test/fast/Unit tests/nvm_get_minor_version index ebb63b34..24fb41d3 100755 --- a/test/fast/Unit tests/nvm_get_minor_version +++ b/test/fast/Unit tests/nvm_get_minor_version @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh expect () { INPUT="$1" diff --git a/test/fast/Unit tests/nvm_get_mirror b/test/fast/Unit tests/nvm_get_mirror index 02863f33..b4a5d171 100755 --- a/test/fast/Unit tests/nvm_get_mirror +++ b/test/fast/Unit tests/nvm_get_mirror @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh ! nvm_get_mirror || die 'unknown release type did not error' ! nvm_get_mirror node || die 'unknown release type did not error' diff --git a/test/fast/Unit tests/nvm_has b/test/fast/Unit tests/nvm_has index 437d26fb..5eb9d5b9 100755 --- a/test/fast/Unit tests/nvm_has +++ b/test/fast/Unit tests/nvm_has @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_has cat && type cat > /dev/null || die 'nvm_has locates "cat" properly' diff --git a/test/fast/Unit tests/nvm_has_solaris_binary b/test/fast/Unit tests/nvm_has_solaris_binary index 5a29112a..9adcd76a 100755 --- a/test/fast/Unit tests/nvm_has_solaris_binary +++ b/test/fast/Unit tests/nvm_has_solaris_binary @@ -2,8 +2,8 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh -. ../../common.sh +\. ../../../nvm.sh +\. ../../common.sh # Invalid version numbers fail assert_not_ok nvm_has_solaris_binary "" diff --git a/test/fast/Unit tests/nvm_has_system_iojs b/test/fast/Unit tests/nvm_has_system_iojs index 58e858f8..0416b718 100755 --- a/test/fast/Unit tests/nvm_has_system_iojs +++ b/test/fast/Unit tests/nvm_has_system_iojs @@ -7,7 +7,7 @@ cleanup () { } die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/versions/io.js/v0.1.2" touch "${NVM_DIR}/versions/io.js/v0.1.2/node" diff --git a/test/fast/Unit tests/nvm_has_system_node b/test/fast/Unit tests/nvm_has_system_node index 10629eed..ea1acfb5 100755 --- a/test/fast/Unit tests/nvm_has_system_node +++ b/test/fast/Unit tests/nvm_has_system_node @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh cleanup () { rm -rf "${NVM_DIR}/v0.1.2/node" diff --git a/test/fast/Unit tests/nvm_iojs_prefix b/test/fast/Unit tests/nvm_iojs_prefix index 66666955..f51d2c31 100755 --- a/test/fast/Unit tests/nvm_iojs_prefix +++ b/test/fast/Unit tests/nvm_iojs_prefix @@ -2,6 +2,6 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh [ "$(nvm_iojs_prefix)" = "iojs" ] || die '"nvm_iojs_prefix" did not return the string "iojs". why did this fail?!' diff --git a/test/fast/Unit tests/nvm_is_alias b/test/fast/Unit tests/nvm_is_alias index b5cf3057..a05fc492 100755 --- a/test/fast/Unit tests/nvm_is_alias +++ b/test/fast/Unit tests/nvm_is_alias @@ -3,7 +3,7 @@ cleanup () { unalias foo; unalias grep; } die () { echo $@ ; cleanup ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh alias foo='bar' nvm_is_alias foo || die '"nvm_is_alias foo" was not true' diff --git a/test/fast/Unit tests/nvm_is_iojs_version b/test/fast/Unit tests/nvm_is_iojs_version index e2f5e3f2..73803aa4 100755 --- a/test/fast/Unit tests/nvm_is_iojs_version +++ b/test/fast/Unit tests/nvm_is_iojs_version @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_is_iojs_version 'iojs-' || die '"nvm_is_iojs_version iojs- was not true' nvm_is_iojs_version 'iojs-foo' || die '"nvm_is_iojs_version iojs- was not true' diff --git a/test/fast/Unit tests/nvm_is_merged_node_version b/test/fast/Unit tests/nvm_is_merged_node_version index 7cf5334e..b7cc0a38 100755 --- a/test/fast/Unit tests/nvm_is_merged_node_version +++ b/test/fast/Unit tests/nvm_is_merged_node_version @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_is_merged_node_version '4.0' || die '"nvm_is_merged_node_version 4.0 was not true' nvm_is_merged_node_version '5.1' || die '"nvm_is_merged_node_version 5.1 was not true' diff --git a/test/fast/Unit tests/nvm_is_natural_num b/test/fast/Unit tests/nvm_is_natural_num index e9b06689..8d08807f 100755 --- a/test/fast/Unit tests/nvm_is_natural_num +++ b/test/fast/Unit tests/nvm_is_natural_num @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh ! nvm_is_natural_num || die 'no args is not false' ! nvm_is_natural_num '' || die 'empty string is not false' diff --git a/test/fast/Unit tests/nvm_is_valid_version b/test/fast/Unit tests/nvm_is_valid_version index d34f7670..d98e60f5 100755 --- a/test/fast/Unit tests/nvm_is_valid_version +++ b/test/fast/Unit tests/nvm_is_valid_version @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_is_valid_version 0.1.2 || die "nvm_is_valid_version 0.1.2 did not return 0" nvm_is_valid_version foo && die "nvm_is_valid_version foo did not return 1" diff --git a/test/fast/Unit tests/nvm_ls_current b/test/fast/Unit tests/nvm_ls_current index bc4a4f5b..4fe484bf 100755 --- a/test/fast/Unit tests/nvm_ls_current +++ b/test/fast/Unit tests/nvm_ls_current @@ -6,7 +6,7 @@ TEST_DIR="$TEST_PWD/nvm_ls_current_tmp" cleanup() { rm -rf "$TEST_DIR"; unset -f return_zero; alias node='node' ; unalias node; } die () { echo $@ ; cleanup ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh return_zero () { return 0; } diff --git a/test/fast/Unit tests/nvm_ls_remote b/test/fast/Unit tests/nvm_ls_remote index 21a13204..0c194ebc 100755 --- a/test/fast/Unit tests/nvm_ls_remote +++ b/test/fast/Unit tests/nvm_ls_remote @@ -6,7 +6,7 @@ cleanup() { unset -f nvm_download } -. ../../../nvm.sh +\. ../../../nvm.sh MOCKS_DIR="$PWD/mocks" diff --git a/test/fast/Unit tests/nvm_ls_remote LTS aliases b/test/fast/Unit tests/nvm_ls_remote LTS aliases index 9a577e6a..2f353880 100755 --- a/test/fast/Unit tests/nvm_ls_remote LTS aliases +++ b/test/fast/Unit tests/nvm_ls_remote LTS aliases @@ -14,7 +14,7 @@ cleanup() { rm -rf "$TEST_PATH" } -. ../../../nvm.sh +\. ../../../nvm.sh set -ex diff --git a/test/fast/Unit tests/nvm_ls_remote_iojs b/test/fast/Unit tests/nvm_ls_remote_iojs index 1f909c72..a23156c6 100755 --- a/test/fast/Unit tests/nvm_ls_remote_iojs +++ b/test/fast/Unit tests/nvm_ls_remote_iojs @@ -6,7 +6,7 @@ cleanup() { unset -f nvm_download } -. ../../../nvm.sh +\. ../../../nvm.sh # sample output at the time the test was written TAB_PATH="$PWD/mocks/iojs.org-dist-index.tab" diff --git a/test/fast/Unit tests/nvm_make_alias b/test/fast/Unit tests/nvm_make_alias index c57906da..1759bb65 100755 --- a/test/fast/Unit tests/nvm_make_alias +++ b/test/fast/Unit tests/nvm_make_alias @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh OUTPUT="$(nvm_make_alias 2>&1)" EXIT_CODE="$(nvm_make_alias >/dev/null 2>&1 ; echo $?)" diff --git a/test/fast/Unit tests/nvm_node_prefix b/test/fast/Unit tests/nvm_node_prefix index a0bc0985..13e3f510 100755 --- a/test/fast/Unit tests/nvm_node_prefix +++ b/test/fast/Unit tests/nvm_node_prefix @@ -2,6 +2,6 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh [ "$(nvm_node_prefix)" = "node" ] || die '"nvm_node_prefix" did not return the string "node". why did this fail?!' diff --git a/test/fast/Unit tests/nvm_num_version_groups b/test/fast/Unit tests/nvm_num_version_groups index 88c240e5..b6da88ea 100755 --- a/test/fast/Unit tests/nvm_num_version_groups +++ b/test/fast/Unit tests/nvm_num_version_groups @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../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" diff --git a/test/fast/Unit tests/nvm_prepend_path b/test/fast/Unit tests/nvm_prepend_path index ef0af811..f46e0244 100755 --- a/test/fast/Unit tests/nvm_prepend_path +++ b/test/fast/Unit tests/nvm_prepend_path @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh TEST_PATH=/usr/bin:/usr/local/bin diff --git a/test/fast/Unit tests/nvm_print_alias_path b/test/fast/Unit tests/nvm_print_alias_path index 14f439ae..0d0babe0 100755 --- a/test/fast/Unit tests/nvm_print_alias_path +++ b/test/fast/Unit tests/nvm_print_alias_path @@ -1,5 +1,5 @@ #!/bin/sh -. ../../common.sh +\. ../../common.sh die () { echo $@ ; cleanup ; exit 1; } @@ -7,7 +7,7 @@ cleanup () { unset -f nvm_alias nvm_version } -. ../../../nvm.sh +\. ../../../nvm.sh NVM_ALIAS_DIR='path/to/the alias/dir' diff --git a/test/fast/Unit tests/nvm_print_default_alias b/test/fast/Unit tests/nvm_print_default_alias index 17857561..4915a198 100755 --- a/test/fast/Unit tests/nvm_print_default_alias +++ b/test/fast/Unit tests/nvm_print_default_alias @@ -1,5 +1,5 @@ #!/bin/sh -. ../../common.sh +\. ../../common.sh die () { echo $@ ; cleanup ; exit 1; } @@ -7,7 +7,7 @@ cleanup () { unset -f nvm_print_implicit_alias nvm_version } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_print_implicit_alias() { echo '' diff --git a/test/fast/Unit tests/nvm_print_implicit_alias errors b/test/fast/Unit tests/nvm_print_implicit_alias errors index a617383f..e824292e 100755 --- a/test/fast/Unit tests/nvm_print_implicit_alias errors +++ b/test/fast/Unit tests/nvm_print_implicit_alias errors @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh EXPECTED_FIRST_MSG="nvm_print_implicit_alias must be specified with local or remote as the first argument." [ "_$(nvm_print_implicit_alias 2>&1)" = "_$EXPECTED_FIRST_MSG" ] \ diff --git a/test/fast/Unit tests/nvm_print_implicit_alias success b/test/fast/Unit tests/nvm_print_implicit_alias success index 7a53d0c8..eb5671d8 100755 --- a/test/fast/Unit tests/nvm_print_implicit_alias success +++ b/test/fast/Unit tests/nvm_print_implicit_alias success @@ -13,7 +13,7 @@ cleanup() { unset -f nvm_ls_remote nvm_ls_remote_iojs } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir "${NVM_DIR}/v0.2.3" mkdir "${NVM_DIR}/v0.3.4" diff --git a/test/fast/Unit tests/nvm_print_npm_version b/test/fast/Unit tests/nvm_print_npm_version index 2bf24a0c..792c6ccb 100755 --- a/test/fast/Unit tests/nvm_print_npm_version +++ b/test/fast/Unit tests/nvm_print_npm_version @@ -7,7 +7,7 @@ cleanup () { } die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_has() { return 1; } OUTPUT="$(nvm_print_npm_version)" diff --git a/test/fast/Unit tests/nvm_remote_version b/test/fast/Unit tests/nvm_remote_version index 0c17591d..e380b2f2 100755 --- a/test/fast/Unit tests/nvm_remote_version +++ b/test/fast/Unit tests/nvm_remote_version @@ -6,7 +6,7 @@ cleanup() { unset -f nvm_ls_remote nvm_ls_remote_iojs } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_ls_remote() { echo "N/A" diff --git a/test/fast/Unit tests/nvm_remote_versions b/test/fast/Unit tests/nvm_remote_versions index bbbaa245..f5050087 100755 --- a/test/fast/Unit tests/nvm_remote_versions +++ b/test/fast/Unit tests/nvm_remote_versions @@ -6,7 +6,7 @@ cleanup() { unset -f nvm_ls_remote nvm_ls_remote_iojs } -. ../../../nvm.sh +\. ../../../nvm.sh OUTPUT="$(nvm_remote_versions stable 2>&1)" EXPECTED_OUTPUT="Implicit aliases are not supported in nvm_remote_versions." diff --git a/test/fast/Unit tests/nvm_strip_iojs_prefix b/test/fast/Unit tests/nvm_strip_iojs_prefix index 782fbc41..98aa43c7 100755 --- a/test/fast/Unit tests/nvm_strip_iojs_prefix +++ b/test/fast/Unit tests/nvm_strip_iojs_prefix @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh [ "_$(nvm_strip_iojs_prefix iojs)" = "_" ] || die '"nvm_strip_iojs_prefix iojs" did not return an empty string' [ "_$(nvm_strip_iojs_prefix iojs-)" = "_" ] || die '"nvm_strip_iojs_prefix iojs-" did not return an empty string' diff --git a/test/fast/Unit tests/nvm_strip_path b/test/fast/Unit tests/nvm_strip_path index b926cc4a..e2d9a49a 100755 --- a/test/fast/Unit tests/nvm_strip_path +++ b/test/fast/Unit tests/nvm_strip_path @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh TEST_PATH=$NVM_DIR/v0.10.5/bin:/usr/bin:$NVM_DIR/v0.11.5/bin:$NVM_DIR/v0.9.5/bin:/usr/local/bin:$NVM_DIR/v0.2.5/bin:$NVM_DIR/versions/node/v0.12.0/bin:$NVM_DIR/versions/io.js/v1.0.0/bin diff --git a/test/fast/Unit tests/nvm_supports_xz b/test/fast/Unit tests/nvm_supports_xz index 5a9e4f7d..09086c3e 100755 --- a/test/fast/Unit tests/nvm_supports_xz +++ b/test/fast/Unit tests/nvm_supports_xz @@ -9,7 +9,7 @@ cleanup() { } die () { echo $@ ; cleanup ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh OLDPATH=$PATH diff --git a/test/fast/Unit tests/nvm_tree_contains_path b/test/fast/Unit tests/nvm_tree_contains_path index a4ca09e3..4efac10e 100755 --- a/test/fast/Unit tests/nvm_tree_contains_path +++ b/test/fast/Unit tests/nvm_tree_contains_path @@ -8,7 +8,7 @@ cleanup () { } die () { echo $@ ; cleanup; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p tmp touch tmp/node diff --git a/test/fast/Unit tests/nvm_validate_implicit_alias b/test/fast/Unit tests/nvm_validate_implicit_alias index 979f8fb0..9d93af9d 100755 --- a/test/fast/Unit tests/nvm_validate_implicit_alias +++ b/test/fast/Unit tests/nvm_validate_implicit_alias @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh EXPECTED_MSG="Only implicit aliases 'stable', 'unstable', 'iojs', and 'node' are supported." [ "_$(nvm_validate_implicit_alias 2>&1)" = "_$EXPECTED_MSG" ] \ diff --git a/test/fast/Unit tests/nvm_version b/test/fast/Unit tests/nvm_version index 4d5063bb..cba10dc8 100755 --- a/test/fast/Unit tests/nvm_version +++ b/test/fast/Unit tests/nvm_version @@ -5,7 +5,7 @@ cleanup () { unset -f nvm_ls_current nvm_ls } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_ls_current() { echo "CURRENT!" diff --git a/test/fast/Unit tests/nvm_version_dir b/test/fast/Unit tests/nvm_version_dir index 6fc880a2..5bc59489 100755 --- a/test/fast/Unit tests/nvm_version_dir +++ b/test/fast/Unit tests/nvm_version_dir @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh [ "$(nvm_version_dir)" = "$NVM_DIR/versions/node" ] || die '"nvm_version_dir" did not return new dir path' [ "$(nvm_version_dir iojs)" = "$NVM_DIR/versions/io.js" ] || die '"nvm_version_dir iojs" did not return iojs dir path' diff --git a/test/fast/Unit tests/nvm_version_greater b/test/fast/Unit tests/nvm_version_greater index 63f58000..a771e849 100755 --- a/test/fast/Unit tests/nvm_version_greater +++ b/test/fast/Unit tests/nvm_version_greater @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm_version_greater 0.10.0 0.2.12 || die '"nvm_version_greater 0.10.0 0.2.12" did not return true' diff --git a/test/fast/Unit tests/nvm_version_path b/test/fast/Unit tests/nvm_version_path index b8ae6858..74996a96 100755 --- a/test/fast/Unit tests/nvm_version_path +++ b/test/fast/Unit tests/nvm_version_path @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh OUTPUT="$(nvm_version_path foo)" EXPECTED_OUTPUT="$NVM_DIR/foo" diff --git a/test/install_script/nvm_check_global_modules b/test/install_script/nvm_check_global_modules index c57d672a..a526dcc4 100755 --- a/test/install_script/nvm_check_global_modules +++ b/test/install_script/nvm_check_global_modules @@ -12,7 +12,7 @@ cleanup () { } die () { echo $@ ; cleanup ; exit 1; } -NVM_ENV=testing . ../../install.sh +NVM_ENV=testing \. ../../install.sh setup () { ORIGINAL_PATH="$PATH" diff --git a/test/install_script/nvm_detect_profile b/test/install_script/nvm_detect_profile index 92da1d2d..e5b71a8b 100755 --- a/test/install_script/nvm_detect_profile +++ b/test/install_script/nvm_detect_profile @@ -2,7 +2,7 @@ setup () { HOME="." - NVM_ENV=testing . ../../install.sh + NVM_ENV=testing \. ../../install.sh touch ".bashrc" touch ".bash_profile" touch ".zshrc" diff --git a/test/install_script/nvm_do_install b/test/install_script/nvm_do_install index a9696021..8ced0ebe 100755 --- a/test/install_script/nvm_do_install +++ b/test/install_script/nvm_do_install @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -NVM_ENV=testing . ../../install.sh +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 8ce5a424..d6d1a423 100755 --- a/test/install_script/nvm_install_dir +++ b/test/install_script/nvm_install_dir @@ -6,7 +6,7 @@ cleanup () { } die () { echo $@ ; cleanup ; exit 1; } -NVM_ENV=testing . ../../install.sh +NVM_ENV=testing \. ../../install.sh HOME="__home__" diff --git a/test/install_script/nvm_reset b/test/install_script/nvm_reset index bc86aa64..7eb9cd2e 100755 --- a/test/install_script/nvm_reset +++ b/test/install_script/nvm_reset @@ -18,7 +18,7 @@ safe_type() { ! safe_type nvm_reset || die 'nvm_reset is still available' ! safe_type nvm_detect_profile || die 'nvm_detect_profile is still available' -NVM_ENV=testing . ../../install.sh +NVM_ENV=testing \. ../../install.sh # Check nvm_reset exists safe_type nvm_reset || die 'nvm_reset is not available' diff --git a/test/install_script/nvm_source b/test/install_script/nvm_source index 83076399..977c9f42 100755 --- a/test/install_script/nvm_source +++ b/test/install_script/nvm_source @@ -6,7 +6,7 @@ cleanup () { } die () { echo $@ ; cleanup ; exit 1; } -NVM_ENV=testing . ../../install.sh +NVM_ENV=testing \. ../../install.sh # nvm_source with no parameter returns the git endpoint echo $(nvm_source) | grep "nvm.git$" > /dev/null || die "nvm_source without arguments should return the location of the git repo" diff --git a/test/installation_iojs/install already installed uses it b/test/installation_iojs/install already installed uses it index 665dbbe0..f4233707 100755 --- a/test/installation_iojs/install already installed uses it +++ b/test/installation_iojs/install already installed uses it @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh [ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message" diff --git a/test/installation_iojs/install from binary b/test/installation_iojs/install from binary index 8be865e0..724e105a 100755 --- a/test/installation_iojs/install from binary +++ b/test/installation_iojs/install from binary @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh NVM_TEST_VERSION="v1.0.0" NVM_PREFIXED_TEST_VERSION="iojs-$NVM_TEST_VERSION" diff --git a/test/installation_iojs/install from source b/test/installation_iojs/install from source index 354de499..c724b3d8 100644 --- a/test/installation_iojs/install from source +++ b/test/installation_iojs/install from source @@ -1,10 +1,10 @@ #!/bin/sh -. ../common.sh +\. ../common.sh die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh set -ex diff --git a/test/installation_iojs/install two versions and use the latest one b/test/installation_iojs/install two versions and use the latest one index cc856537..29372bfa 100755 --- a/test/installation_iojs/install two versions and use the latest one +++ b/test/installation_iojs/install two versions and use the latest one @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh # Remove the stuff we're clobbering. [ -e "${NVM_DIR}/versions/io.js/v1.0.0" ] && rm -R "${NVM_DIR}/versions/io.js/v1.0.0" diff --git a/test/installation_iojs/install version specified in .nvmrc from binary b/test/installation_iojs/install version specified in .nvmrc from binary index b798c2dd..73dcfd38 100755 --- a/test/installation_iojs/install version specified in .nvmrc from binary +++ b/test/installation_iojs/install version specified in .nvmrc from binary @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh NVM_TEST_VERSION=v1.0.0 NVM_PREFIXED_TEST_VERSION="iojs-${NVM_TEST_VERSION}" diff --git a/test/installation_iojs/install version specified in .nvmrc from source b/test/installation_iojs/install version specified in .nvmrc from source index df3f46ce..9f97a306 100644 --- a/test/installation_iojs/install version specified in .nvmrc from source +++ b/test/installation_iojs/install version specified in .nvmrc from source @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh set -ex diff --git a/test/installation_iojs/install while reinstalling packages b/test/installation_iojs/install while reinstalling packages index 56e5ff48..3b2dc0f5 100755 --- a/test/installation_iojs/install while reinstalling packages +++ b/test/installation_iojs/install while reinstalling packages @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh # Remove the stuff we're clobbering. [ -e "${NVM_DIR}/versions/io.js/v1.0.0" ] && rm -R "${NVM_DIR}/versions/io.js/v1.0.0" diff --git a/test/installation_iojs/nvm install v1 works b/test/installation_iojs/nvm install v1 works index 95ecc420..505aef70 100755 --- a/test/installation_iojs/nvm install v1 works +++ b/test/installation_iojs/nvm install v1 works @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh NVM_VERSION="v1" NVM_PREFIXED_TEST_VERSION="$(nvm ls-remote "$NVM_VERSION" | tail -1 | sed 's/^[ ]*//;s/[ ]*$//')" diff --git a/test/installation_iojs/teardown_dir b/test/installation_iojs/teardown_dir index 295db62a..2eda91f9 100755 --- a/test/installation_iojs/teardown_dir +++ b/test/installation_iojs/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../nvm.sh +\. ../../nvm.sh nvm deactivate nvm uninstall iojs-v1.0.0 nvm uninstall iojs-v1.0.3 diff --git a/test/installation_node/install LTS b/test/installation_node/install LTS index 86aa33da..2435fc30 100755 --- a/test/installation_node/install LTS +++ b/test/installation_node/install LTS @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh nvm unalias default >/dev/null 2>&1 || die 'unable to unalias default' diff --git a/test/installation_node/install already installed uses it b/test/installation_node/install already installed uses it index b47694f0..29067843 100755 --- a/test/installation_node/install already installed uses it +++ b/test/installation_node/install already installed uses it @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh [ "$(nvm install invalid.invalid 2>&1)" = "Version 'invalid.invalid' not found - try \`nvm ls-remote\` to browse available versions." ] || die "nvm installing an invalid version did not print a nice error message" diff --git a/test/installation_node/install from binary b/test/installation_node/install from binary index 114205d3..d3635f3e 100755 --- a/test/installation_node/install from binary +++ b/test/installation_node/install from binary @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh nvm unalias default || die 'unable to unalias default' diff --git a/test/installation_node/install from source b/test/installation_node/install from source index 1d4fa39b..b0942f9d 100755 --- a/test/installation_node/install from source +++ b/test/installation_node/install from source @@ -5,7 +5,7 @@ set -ex die () { echo $@ ; exit 1; } set +e # TODO: fix -. ../../nvm.sh +\. ../../nvm.sh set -e nvm deactivate || die 'deactivate failed' diff --git a/test/installation_node/install from source implicitly b/test/installation_node/install from source implicitly index 7b011780..a3c043c9 100755 --- a/test/installation_node/install from source implicitly +++ b/test/installation_node/install from source implicitly @@ -5,7 +5,7 @@ set -ex die () { echo $@ ; exit 1; } set +e # TODO: fix -. ../../nvm.sh +\. ../../nvm.sh set -e nvm deactivate || die 'deactivate failed' diff --git a/test/installation_node/install from source with thread parameter b/test/installation_node/install from source with thread parameter index 4de8942a..f9aee3db 100755 --- a/test/installation_node/install from source with thread parameter +++ b/test/installation_node/install from source with thread parameter @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh NVM_TEST_VERSION=v0.10.41 diff --git a/test/installation_node/install from source without V8 snapshot for ARM b/test/installation_node/install from source without V8 snapshot for ARM index 3c2eeafc..0e22ac7d 100755 --- a/test/installation_node/install from source without V8 snapshot for ARM +++ b/test/installation_node/install from source without V8 snapshot for ARM @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh NVM_TEST_VERSION=v0.10.7 diff --git a/test/installation_node/install two versions and use the latest one b/test/installation_node/install two versions and use the latest one index 6f1d380b..35ca3b45 100755 --- a/test/installation_node/install two versions and use the latest one +++ b/test/installation_node/install two versions and use the latest one @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh # Remove the stuff we're clobbering. [ -e "${NVM_DIR}/v0.9.7" ] && rm -R "${NVM_DIR}/v0.9.7" 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 ad5f296e..c074d651 100755 --- a/test/installation_node/install version specified in .nvmrc from binary +++ b/test/installation_node/install version specified in .nvmrc from binary @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh NVM_TEST_VERSION=v0.10.7 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 63ea0eaa..89094a84 100755 --- a/test/installation_node/install version specified in .nvmrc from source +++ b/test/installation_node/install version specified in .nvmrc from source @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh NVM_TEST_VERSION=v0.10.7 diff --git a/test/installation_node/install while reinstalling packages b/test/installation_node/install while reinstalling packages index 7d1a15ec..53879d58 100755 --- a/test/installation_node/install while reinstalling packages +++ b/test/installation_node/install while reinstalling packages @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh # Remove the stuff we're clobbering. [ -e "${NVM_DIR}/v0.9.7" ] && rm -R "${NVM_DIR}/v0.9.7" diff --git a/test/installation_node/teardown_dir b/test/installation_node/teardown_dir index a37d0e65..5f1d6ce7 100755 --- a/test/installation_node/teardown_dir +++ b/test/installation_node/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../nvm.sh +\. ../../nvm.sh nvm deactivate nvm uninstall v0.10.7 nvm uninstall v4.2.2 diff --git "a/test/slow/Running \"nvm current\" should display current nvm environment." "b/test/slow/Running \"nvm current\" should display current nvm environment." index 05082e3b..c36e55ee 100755 --- "a/test/slow/Running \"nvm current\" should display current nvm environment." +++ "b/test/slow/Running \"nvm current\" should display current nvm environment." @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh nvm install 0.10 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 fd98aa92..299c3fcb 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 @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../nvm.sh +\. ../../nvm.sh 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)" 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 a4153abf..866c43f5 100755 --- "a/test/slow/nvm exec/Preamble works and respects \"silent\" flag" +++ "b/test/slow/nvm exec/Preamble works and respects \"silent\" flag" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm use 0.10 NPM_VERSION_TEN="$(npm --version)" diff --git "a/test/slow/nvm exec/Running \"nvm exec --lts\" should work" "b/test/slow/nvm exec/Running \"nvm exec --lts\" should work" index ce8ebaf1..09399418 100755 --- "a/test/slow/nvm exec/Running \"nvm exec --lts\" should work" +++ "b/test/slow/nvm exec/Running \"nvm exec --lts\" should work" @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm install --lts || die 'nvm install --lts failed' diff --git "a/test/slow/nvm exec/Running \"nvm exec 0.x\" should work" "b/test/slow/nvm exec/Running \"nvm exec 0.x\" should work" index b06bbdcc..72c385e4 100755 --- "a/test/slow/nvm exec/Running \"nvm exec 0.x\" should work" +++ "b/test/slow/nvm exec/Running \"nvm exec 0.x\" should work" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm use 0.10 NPM_VERSION_TEN="$(npm --version)" 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 3cc0cb8b..737f7870 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" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm use 0.10.7 NPM_VERSION_TEN="$(npm --version)" diff --git a/test/slow/nvm exec/setup_dir b/test/slow/nvm exec/setup_dir index d6bba73f..e7853d8a 100755 --- a/test/slow/nvm exec/setup_dir +++ b/test/slow/nvm exec/setup_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm install 0.10.7 nvm install 1.0.0 nvm install --lts diff --git a/test/slow/nvm exec/teardown_dir b/test/slow/nvm exec/teardown_dir index 573e91d4..ab6c7fce 100755 --- a/test/slow/nvm exec/teardown_dir +++ b/test/slow/nvm exec/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate nvm uninstall v0.10.7 nvm uninstall v1.0.0 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 1951b12f..e21b5e46 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" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm use 0.10.28 > /dev/null diff --git a/test/slow/nvm reinstall-packages/setup_dir b/test/slow/nvm reinstall-packages/setup_dir index c550f69f..7648954b 100755 --- a/test/slow/nvm reinstall-packages/setup_dir +++ b/test/slow/nvm reinstall-packages/setup_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm install 0.10.28 nvm install 0.10.29 diff --git a/test/slow/nvm reinstall-packages/should work as expected b/test/slow/nvm reinstall-packages/should work as expected index e0156d43..7235cbb2 100755 --- a/test/slow/nvm reinstall-packages/should work as expected +++ b/test/slow/nvm reinstall-packages/should work as expected @@ -2,7 +2,7 @@ die () { echo "$@" ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm exec 0.10.28 npm install -g npm@~1.4.11 # this is required because before 1.4.10, npm ls doesn't indicated linked packages nvm exec 0.10.29 npm install -g npm@~1.4.11 # this is required because before 1.4.10, npm ls doesn't indicated linked packages diff --git a/test/slow/nvm reinstall-packages/teardown_dir b/test/slow/nvm reinstall-packages/teardown_dir index 1282eb4d..13ea150b 100755 --- a/test/slow/nvm reinstall-packages/teardown_dir +++ b/test/slow/nvm reinstall-packages/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm uninstall v0.10.28 nvm uninstall v0.10.29 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 dfb90a99..0fa20899 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" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh 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 --lts\" should work" "b/test/slow/nvm run/Running \"nvm run --lts\" should work" index c512887d..1c73b6ee 100755 --- "a/test/slow/nvm run/Running \"nvm run --lts\" should work" +++ "b/test/slow/nvm run/Running \"nvm run --lts\" should work" @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh OUTPUT="$(nvm run --silent --lts --version)" EXPECTED_OUTPUT="$(nvm_match_version 'lts/*')" diff --git "a/test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed" "b/test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed" index 5a2aef25..7777bc9a 100755 --- "a/test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed" +++ "b/test/slow/nvm run/Running \"nvm run 0.x\" should error out sensibly when 0.x is not installed" @@ -3,7 +3,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh EXPECTED_OUTPUT='N/A: version "v0.2" is not yet installed. 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 9bcf97f5..0d7e9ef1 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" @@ -3,7 +3,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../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 d4624889..dc2f1977 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" @@ -3,7 +3,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh echo "0.10.7" > .nvmrc diff --git a/test/slow/nvm run/setup_dir b/test/slow/nvm run/setup_dir index a767a022..481be49c 100755 --- a/test/slow/nvm run/setup_dir +++ b/test/slow/nvm run/setup_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm install 0.10.7 nvm install --lts=argon diff --git a/test/slow/nvm run/teardown_dir b/test/slow/nvm run/teardown_dir index 4290f076..d3274c8d 100755 --- a/test/slow/nvm run/teardown_dir +++ b/test/slow/nvm run/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate nvm uninstall v0.10.7 diff --git "a/test/slow/nvm uninstall/Running \"nvm uninstall 0.12.6\" uninstalls v0.12.6" "b/test/slow/nvm uninstall/Running \"nvm uninstall 0.12.6\" uninstalls v0.12.6" index 67d054ba..732f70ad 100755 --- "a/test/slow/nvm uninstall/Running \"nvm uninstall 0.12.6\" uninstalls v0.12.6" +++ "b/test/slow/nvm uninstall/Running \"nvm uninstall 0.12.6\" uninstalls v0.12.6" @@ -3,7 +3,7 @@ die () { echo $@ ; exit 1; } # Source nvm -. ../../../nvm.sh +\. ../../../nvm.sh # Version to install/uninstall NVM_TEST_VERSION=0.12.6 diff --git "a/test/slow/nvm uninstall/Running \"nvm uninstall\" with incorrect file permissions fails nicely" "b/test/slow/nvm uninstall/Running \"nvm uninstall\" with incorrect file permissions fails nicely" index 0939d952..4f7fe05d 100755 --- "a/test/slow/nvm uninstall/Running \"nvm uninstall\" with incorrect file permissions fails nicely" +++ "b/test/slow/nvm uninstall/Running \"nvm uninstall\" with incorrect file permissions fails nicely" @@ -3,7 +3,7 @@ die () { echo $@ ; exit 1; } # Source nvm -. ../../../nvm.sh +\. ../../../nvm.sh # Version to install/uninstall NVM_TEST_VERSION=5.10.1 diff --git a/test/slow/nvm uninstall/setup_dir b/test/slow/nvm uninstall/setup_dir index f385d980..108dbe33 100755 --- a/test/slow/nvm uninstall/setup_dir +++ b/test/slow/nvm uninstall/setup_dir @@ -1,4 +1,4 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm install 0.12.7 diff --git a/test/slow/nvm uninstall/teardown_dir b/test/slow/nvm uninstall/teardown_dir index f505f219..2fad54c9 100755 --- a/test/slow/nvm uninstall/teardown_dir +++ b/test/slow/nvm uninstall/teardown_dir @@ -1,5 +1,5 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh nvm uninstall 0.12.7 nvm deactivate diff --git "a/test/slow/nvm use/Running \"nvm use --lts\" uses latest LTS version" "b/test/slow/nvm use/Running \"nvm use --lts\" uses latest LTS version" index fc82a7b6..6b9dbe81 100755 --- "a/test/slow/nvm use/Running \"nvm use --lts\" uses latest LTS version" +++ "b/test/slow/nvm use/Running \"nvm use --lts\" uses latest LTS version" @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate >/dev/null 2>&1 || die 'deactivate failed' diff --git "a/test/slow/nvm use/Running \"nvm use --lts=foo\" uses latest \"foo\" LTS version" "b/test/slow/nvm use/Running \"nvm use --lts=foo\" uses latest \"foo\" LTS version" index 73bdd651..13cc53bb 100755 --- "a/test/slow/nvm use/Running \"nvm use --lts=foo\" uses latest \"foo\" LTS version" +++ "b/test/slow/nvm use/Running \"nvm use --lts=foo\" uses latest \"foo\" LTS version" @@ -4,7 +4,7 @@ set -ex die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate 2>&1 >/dev/null || die 'deactivate failed' diff --git "a/test/slow/nvm use/Running \"nvm use iojs\" uses latest io.js version" "b/test/slow/nvm use/Running \"nvm use iojs\" uses latest io.js version" index 506ff867..4e7455da 100755 --- "a/test/slow/nvm use/Running \"nvm use iojs\" uses latest io.js version" +++ "b/test/slow/nvm use/Running \"nvm use iojs\" uses latest io.js version" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate 2>&1 >/dev/null || die 'deactivate failed' diff --git "a/test/slow/nvm use/Running \"nvm use node\" uses latest stable node version" "b/test/slow/nvm use/Running \"nvm use node\" uses latest stable node version" index ce84bb69..5cf8000b 100755 --- "a/test/slow/nvm use/Running \"nvm use node\" uses latest stable node version" +++ "b/test/slow/nvm use/Running \"nvm use node\" uses latest stable node version" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate 2>&1 >/dev/null || die 'deactivate failed' diff --git "a/test/slow/nvm use/Running \"nvm use v1.0.0\" uses iojs-v1.0.0 iojs version" "b/test/slow/nvm use/Running \"nvm use v1.0.0\" uses iojs-v1.0.0 iojs version" index 2416c794..799c2ace 100755 --- "a/test/slow/nvm use/Running \"nvm use v1.0.0\" uses iojs-v1.0.0 iojs version" +++ "b/test/slow/nvm use/Running \"nvm use v1.0.0\" uses iojs-v1.0.0 iojs version" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate 2>&1 >/dev/null || die 'deactivate failed' diff --git "a/test/slow/nvm use/Running \"nvm use\" calls \"nvm_die_on_prefix\"" "b/test/slow/nvm use/Running \"nvm use\" calls \"nvm_die_on_prefix\"" index faf9644d..53f44b1f 100755 --- "a/test/slow/nvm use/Running \"nvm use\" calls \"nvm_die_on_prefix\"" +++ "b/test/slow/nvm use/Running \"nvm use\" calls \"nvm_die_on_prefix\"" @@ -2,7 +2,7 @@ die () { echo $@ ; exit 1; } -. ../../../nvm.sh +\. ../../../nvm.sh nvm deactivate >/dev/null 2>&1 || die 'deactivate failed' diff --git a/test/slow/nvm use/setup_dir b/test/slow/nvm use/setup_dir index 767ab558..e917f0bd 100755 --- a/test/slow/nvm use/setup_dir +++ b/test/slow/nvm use/setup_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh mkdir -p "${NVM_DIR}/.nvm_use_bak" if [ -d "${NVM_DIR}/v*" ]; then diff --git a/test/slow/nvm use/teardown_dir b/test/slow/nvm use/teardown_dir index a1543e5d..947be611 100755 --- a/test/slow/nvm use/teardown_dir +++ b/test/slow/nvm use/teardown_dir @@ -1,6 +1,6 @@ #!/bin/sh -. ../../../nvm.sh +\. ../../../nvm.sh for VERSION in "0.8.7" "0.9.1" "0.10.1" "0.11.1"; do nvm uninstall "$VERSION" diff --git a/test/slow/nvm_get_latest/nvm_get_latest b/test/slow/nvm_get_latest/nvm_get_latest index 3348fd50..bb198eee 100755 --- a/test/slow/nvm_get_latest/nvm_get_latest +++ b/test/slow/nvm_get_latest/nvm_get_latest @@ -6,7 +6,7 @@ cleanup() { unset -f curl wget nvm_has } -. ../../../nvm.sh +\. ../../../nvm.sh EXPECTED_VERSION="v12.3.456" URL="https://github.com/creationix/nvm/releases/tag/$EXPECTED_VERSION" 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 cc43b536..3a6aa1da 100755 --- a/test/slow/nvm_get_latest/nvm_get_latest failed redirect +++ b/test/slow/nvm_get_latest/nvm_get_latest failed redirect @@ -6,7 +6,7 @@ cleanup() { unset -f curl wget } -. ../../../nvm.sh +\. ../../../nvm.sh curl() { return 1 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 03b2fe33..23a0dc61 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 @@ -4,8 +4,8 @@ die () { echo $@ ; exit 1; } echo '0.10.1' > ../../alias/default || die 'creation of default alias failed' -. ../../nvm.sh || die 'sourcing returned nonzero exit code' -. ../common.sh +\. ../../nvm.sh || die 'sourcing returned nonzero exit code' +\. ../common.sh NVM_LS_CURRENT="$(nvm ls current | strip_colors | \grep -o v0.10.1)" [ "_$NVM_LS_CURRENT" = '_v0.10.1' ] || die "'nvm ls current' did not return '-> v0.10.1', got '$NVM_LS_CURRENT'" 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 edc56142..08cfb93c 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 @@ -12,7 +12,7 @@ fi echo '0.10.2' > ../../.nvmrc || die 'creation of .nvmrc failed' -. ../../nvm.sh --install +\. ../../nvm.sh --install EXIT_CODE="$(echo $?)" echo 'sourcing complete.' 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 3b6fbaf8..3da82f71 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 @@ -1,5 +1,5 @@ #!/bin/sh -. ../common.sh +\. ../common.sh die () { echo $@ ; exit 1; } supports_source_options () { @@ -15,7 +15,7 @@ echo '0.10.2' > ../../alias/default || die 'creation of default alias failed' echo 'sourcing nvm with --install...' -. ../../nvm.sh --install +\. ../../nvm.sh --install EXIT_CODE="$(echo $?)" echo 'sourcing complete.' 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 c0b6533d..334deda3 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 @@ -10,7 +10,7 @@ if ! supports_source_options; then exit 0; fi -. ../../nvm.sh +\. ../../nvm.sh nvm install 4.1.0 || die 'install of v4.1.0 failed' nvm_version 4.1.0 >/dev/null 2>&1 || die "v4.1.0 not installed: $(nvm ls)" nvm deactivate || die 'nvm deactivate failed' @@ -20,7 +20,7 @@ NVM_CURRENT="$(nvm current)" nvm unload || die 'nvm unload failed' -. ../../nvm.sh --no-use +\. ../../nvm.sh --no-use EXIT_CODE="$(echo $?)" echo 'sourcing complete.' diff --git a/test/sourcing/Sourcing nvm.sh with no default should return 0 b/test/sourcing/Sourcing nvm.sh with no default should return 0 index 91e149a7..d2b5f71f 100755 --- a/test/sourcing/Sourcing nvm.sh with no default should return 0 +++ b/test/sourcing/Sourcing nvm.sh with no default should return 0 @@ -8,4 +8,4 @@ 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' +\. ../../nvm.sh || die 'sourcing returned nonzero exit code' diff --git a/test/sourcing/setup b/test/sourcing/setup index 201b9c1c..c87df100 100755 --- a/test/sourcing/setup +++ b/test/sourcing/setup @@ -7,7 +7,7 @@ rm -rf ../../v0.10.7 rm -rf ../../v0.9.7 rm -rf ../../v0.9.12 -. ../../nvm.sh +\. ../../nvm.sh 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'