[Tests] use $NVM_DIR instead of relative paths

test/fast/Aliases/Running "nvm alias" lists manual aliases instead of implicit aliases when present

@@ -5,18 +5,18 @@
 
 die () { echo $@ ; cleanup ; exit 1; }
 cleanup () {
-  rm -rf ../../../alias/stable
-  rm -rf ../../../alias/unstable
-  rm -rf ../../../alias/node
-  rm -rf ../../../alias/iojs
-  rm -rf ../../../v0.8.1
-  rm -rf ../../../v0.9.1
-  rm -rf ../../../versions/io.js/v0.2.1
+  rm -rf "$(nvm_alias_path)/stable"
+  rm -rf "$(nvm_alias_path)/unstable"
+  rm -rf "$(nvm_alias_path)/node"
+  rm -rf "$(nvm_alias_path)/iojs"
+  rm -rf "${NVM_DIR}/v0.8.1"
+  rm -rf "${NVM_DIR}/v0.9.1"
+  rm -rf "${NVM_DIR}/versions/io.js/v0.2.1"
 }
 
-mkdir ../../../v0.8.1
-mkdir ../../../v0.9.1
-mkdir -p ../../../versions/io.js/v0.2.1
+mkdir "${NVM_DIR}/v0.8.1"
+mkdir "${NVM_DIR}/v0.9.1"
+mkdir -p "${NVM_DIR}/versions/io.js/v0.2.1"
 
 EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
 STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"

test/fast/Listing paths/Running "nvm which 0.0.2" should display only version 0.0.2.

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-mkdir -p ../../../v0.0.2
-mkdir -p ../../../v0.0.20
-mkdir -p ../../../versions/node/v0.12.0
-
 . ../../../nvm.sh
 
+mkdir -p "${NVM_DIR}/v0.0.2"
+mkdir -p "${NVM_DIR}/v0.0.20"
+mkdir -p "${NVM_DIR}/versions/node/v0.12.0"
+
 die () { echo $@ ; exit 1; }
 
 # The result should contain only the appropriate version numbers.
@@ -24,4 +24,3 @@ nvm which 0.12.0 || die "v0.0.20 not found"
 NVM_BIN="$(nvm which 0.12.0)"
 [ "_$NVM_BIN" = "_$(nvm_version_path v0.12.0)/bin/node" ] \
   || die "'nvm which 0.12.0' did not contain the correct path: got '$NVM_BIN'"
-

test/fast/Listing versions/Running "nvm ls 0.0.2" should display only version 0.0.2.

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-mkdir ../../../v0.0.2
-mkdir ../../../v0.0.20
-
 . ../../../nvm.sh
 
+mkdir "${NVM_DIR}/v0.0.2"
+mkdir "${NVM_DIR}/v0.0.20"
+
 die () { echo $@ ; exit 1; }
 
 # The result should contain only the appropriate version numbers.

test/fast/Listing versions/Running "nvm ls 0.2" should display only 0.2.x versions.

@@ -1,11 +1,11 @@
 #!/bin/sh
 
-mkdir ../../../v0.1.3
-mkdir ../../../v0.2.3
-mkdir ../../../v0.20.3
-
 . ../../../nvm.sh
 
+mkdir "${NVM_DIR}/v0.1.3"
+mkdir "${NVM_DIR}/v0.2.3"
+mkdir "${NVM_DIR}/v0.20.3"
+
 die () { echo $@ ; exit 1; }
 
 # The result should contain only the appropriate version numbers.

test/fast/Listing versions/Running "nvm ls stable" and "nvm ls unstable" should return the appropriate implicit alias

@@ -4,8 +4,8 @@
 
 die () { echo $@ ; exit 1; }
 
-mkdir ../../../v0.2.3
-mkdir ../../../v0.3.3
+mkdir "${NVM_DIR}/v0.2.3"
+mkdir "${NVM_DIR}/v0.3.3"
 
 EXPECTED_STABLE="$(nvm_print_implicit_alias local stable)"
 STABLE_VERSION="$(nvm_version "$EXPECTED_STABLE")"
@@ -19,7 +19,7 @@ nvm ls stable | \grep "$STABLE_VERSION" >/dev/null \
 nvm ls unstable | \grep "$UNSTABLE_VERSION" >/dev/null \
   || die "expected 'nvm ls unstable' to give $UNSTABLE_VERSION, got $(nvm ls unstable)"
 
-mkdir ../../../v0.1.2
+mkdir "${NVM_DIR}/v0.1.2"
 nvm alias stable 0.1
 
 nvm ls stable | \grep -v "$STABLE_VERSION" >/dev/null \

test/fast/Listing versions/Running "nvm ls system" should include "system" when appropriate

@@ -4,12 +4,12 @@ die () { echo $@ ; exit 1; }
 
 . ../../../nvm.sh
 
-mkdir -p ../../../v0.0.1
-mkdir -p ../../../v0.0.3
-mkdir -p ../../../v0.0.9
-mkdir -p ../../../v0.3.1
-mkdir -p ../../../v0.3.3
-mkdir -p ../../../v0.3.9
+mkdir -p "${NVM_DIR}/v0.0.1"
+mkdir -p "${NVM_DIR}/v0.0.3"
+mkdir -p "${NVM_DIR}/v0.0.9"
+mkdir -p "${NVM_DIR}/v0.3.1"
+mkdir -p "${NVM_DIR}/v0.3.3"
+mkdir -p "${NVM_DIR}/v0.3.9"
 
 nvm_has_system_node() { return 0; }
 nvm ls system | grep system 2>&1 > /dev/null

test/fast/Listing versions/Running "nvm ls" should display all installed versions.

@@ -2,16 +2,16 @@
 
 . ../../../nvm.sh
 
-mkdir ../../../v0.0.1
-mkdir ../../../v0.0.3
-mkdir ../../../v0.0.9
-mkdir ../../../v0.3.1
-mkdir ../../../v0.3.3
-mkdir ../../../v0.3.9
-mkdir -p ../../../versions/node/v0.12.87
-mkdir -p ../../../versions/node/v0.12.9
-mkdir -p ../../../versions/io.js/v0.1.2
-mkdir -p ../../../versions/io.js/v0.10.2
+mkdir "${NVM_DIR}/v0.0.1"
+mkdir "${NVM_DIR}/v0.0.3"
+mkdir "${NVM_DIR}/v0.0.9"
+mkdir "${NVM_DIR}/v0.3.1"
+mkdir "${NVM_DIR}/v0.3.3"
+mkdir "${NVM_DIR}/v0.3.9"
+mkdir -p "${NVM_DIR}/versions/node/v0.12.87"
+mkdir -p "${NVM_DIR}/versions/node/v0.12.9"
+mkdir -p "${NVM_DIR}/versions/io.js/v0.1.2"
+mkdir -p "${NVM_DIR}/versions/io.js/v0.10.2"
 
 # The result should contain the version numbers.
 nvm ls | grep v0.0.1 >/dev/null &&

test/fast/Listing versions/Running "nvm ls" should filter out ".nvm"

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-mkdir ../../../v0.1.3
-mkdir ../../../v0.2.3
-
 . ../../../nvm.sh
 
+mkdir "${NVM_DIR}/v0.1.3"
+mkdir "${NVM_DIR}/v0.2.3"
+
 [ -z `nvm ls | grep '^ *\.'` ]
 # The result should contain only the appropriate version numbers.

test/fast/Listing versions/Running "nvm ls" should filter out "versions"

@@ -1,10 +1,10 @@
 #!/bin/sh
 
-mkdir ../../../v0.1.3
-mkdir ../../../v0.2.3
-mkdir -p ../../../versions/node
-
 . ../../../nvm.sh
 
+mkdir "${NVM_DIR}/v0.1.3"
+mkdir "${NVM_DIR}/v0.2.3"
+mkdir -p "${NVM_DIR}/versions/node"
+
 [ -z "$(nvm ls | \grep 'versions')" ]
 # The result should contain only the appropriate version numbers.

test/fast/Listing versions/Running "nvm ls" should include "system" when appropriate

@@ -4,12 +4,12 @@ die () { echo $@ ; exit 1; }
 
 . ../../../nvm.sh
 
-mkdir -p ../../../v0.0.1
-mkdir -p ../../../v0.0.3
-mkdir -p ../../../v0.0.9
-mkdir -p ../../../v0.3.1
-mkdir -p ../../../v0.3.3
-mkdir -p ../../../v0.3.9
+mkdir -p "${NVM_DIR}/v0.0.1"
+mkdir -p "${NVM_DIR}/v0.0.3"
+mkdir -p "${NVM_DIR}/v0.0.9"
+mkdir -p "${NVM_DIR}/v0.3.1"
+mkdir -p "${NVM_DIR}/v0.3.3"
+mkdir -p "${NVM_DIR}/v0.3.9"
 
 nvm_has_system_node() { return 0; }
 nvm ls | grep system 2>&1 > /dev/null

test/fast/Listing versions/Running "nvm ls" should list versions in the "versions" directory

@@ -2,10 +2,10 @@
 
 die () { echo $@ ; exit 1; }
 
-mkdir -p ../../../versions/node/v0.12.1
-mkdir ../../../v0.1.3
-
 . ../../../nvm.sh
 
+mkdir -p "${NVM_DIR}/versions/node/v0.12.1"
+mkdir "${NVM_DIR}/v0.1.3"
+
 nvm ls 0.12 | grep v0.12.1 || die '"nvm ls" did not list a version in the versions/ directory'
 nvm ls 0.1 | grep v0.1.3 || die '"nvm ls" did not list a version not in the versions/ directory'

test/fast/Listing versions/Running "nvm ls" with node-like versioning vx.x.x should only list a matched version

@@ -1,9 +1,9 @@
 #!/bin/sh
 
-mkdir ../../../v0.1.2
-
 . ../../../nvm.sh
 
+mkdir "${NVM_DIR}/v0.1.2"
+
 nvm ls v0.1 | grep v0.1.2 &&
 nvm ls v0.1.2 | grep v0.1.2 &&
 nvm ls v0.1. | grep v0.1.2 &&

test/fast/Running "nvm install" with "--reinstall-packages-from" requires a valid version

@@ -2,13 +2,13 @@
 
 die () { echo $@ ; cleanup ; exit 1; }
 cleanup () {
-  rm -rf ../../v0.10.4
+  rm -rf "${NVM_DIR}/v0.10.4"
 }
 
-mkdir ../../v0.10.4
-
 . ../../nvm.sh
 
+mkdir "${NVM_DIR}/v0.10.4"
+
 nvm deactivate >/dev/null 2>&1
 
 INSTALL_ERROR_MSG="$(nvm install v0.10.5 --reinstall-packages-from=0.11 2>&1)"
@@ -29,3 +29,4 @@ INSTALL_EXIT_CODE="$(nvm install v0.10.5 --reinstall-packages-from=0.10.5 >/dev/
 [ "~$INSTALL_EXIT_CODE" = "~4" ] \
   || die ""nvm install --reinstall-packages-from" should exit with code 4 when given the same version, got $INSTALL_EXIT_CODE"
 
+cleanup

test/fast/Running "nvm use x" should create and change the "current" symlink

@@ -3,31 +3,31 @@
 export NVM_SYMLINK_CURRENT=true
 . ../../nvm.sh
 
-rm -rf ../../v0.10.29
-mkdir ../../v0.10.29
+rm -rf "${NVM_DIR}/v0.10.29"
+mkdir "${NVM_DIR}/v0.10.29"
 nvm use 0.10.29
-rmdir ../../v0.10.29
+rmdir "${NVM_DIR}/v0.10.29"
 
-if [ ! -L ../../current ];then
+if [ ! -L "${NVM_DIR}/current" ];then
   echo "Expected 'current' symlink to be created!"
   exit 1
 fi
 
-oldLink="$(readlink ../../current)"
+oldLink="$(readlink "${NVM_DIR}/current")"
 
-if [ "$(basename $oldLink)" != 'v0.10.29' ];then
-  echo "Expected 'current' to point to v0.10.29 but was $oldLink"
+if [ "$(basename "${oldLink}")" != 'v0.10.29' ];then
+  echo "Expected 'current' to point to v0.10.29 but was ${oldLink}"
   exit 1
 fi
 
-rm -rf ../../v0.11.13
-mkdir ../../v0.11.13
+rm -rf "${NVM_DIR}/v0.11.13"
+mkdir "${NVM_DIR}/v0.11.13"
 nvm use 0.11.13
-rmdir ../../v0.11.13
+rmdir "${NVM_DIR}/v0.11.13"
 
-newLink="$(readlink ../../current)"
+newLink="$(readlink "${NVM_DIR}/current")"
 
-if [ "$(basename $newLink)" != 'v0.11.13' ];then
+if [ "$(basename "${newLink}")" != 'v0.11.13' ];then
   echo "Expected 'current' to point to v0.11.13 but was $newLink"
   exit 1
 fi

test/fast/Unit tests/nvm_has_system_iojs

@@ -1,17 +1,17 @@
 #!/bin/sh
 
 cleanup () {
-  rm ../../../versions/io.js/v0.1.2/node
-  rm ../../../versions/io.js/v0.1.2/iojs
-  rmdir ../../../versions/io.js/v0.1.2
+  rm "${NVM_DIR}/versions/io.js/v0.1.2/node"
+  rm "${NVM_DIR}/versions/io.js/v0.1.2/iojs"
+  rmdir "${NVM_DIR}/versions/io.js/v0.1.2"
 }
 die () { echo $@ ; exit 1; }
 
 . ../../../nvm.sh
 
-mkdir ../../../versions/io.js/v0.1.2
-touch ../../../versions/io.js/v0.1.2/node
-touch ../../../versions/io.js/v0.1.2/iojs
+mkdir "${NVM_DIR}/versions/io.js/v0.1.2"
+touch "${NVM_DIR}/versions/io.js/v0.1.2/node"
+touch "${NVM_DIR}/versions/io.js/v0.1.2/iojs"
 
 nvm use iojs-v0.1.2
 
@@ -28,4 +28,3 @@ if command -v iojs; then
 else
   ! nvm_has_system_iojs
 fi
-

test/fast/Unit tests/nvm_has_system_node

@@ -1,15 +1,14 @@
 #!/bin/sh
 
+. ../../../nvm.sh
+
 cleanup () {
-  rm ../../../v0.1.2/node
-  rmdir ../../../v0.1.2
+  rm -rf "${NVM_DIR}/v0.1.2/node"
 }
 die () { echo $@ ; exit 1; }
 
-. ../../../nvm.sh
-
-mkdir ../../../v0.1.2
-touch ../../../v0.1.2/node
+mkdir "${NVM_DIR}/v0.1.2"
+touch "${NVM_DIR}/v0.1.2/node"
 
 nvm use 0.1.2
 
@@ -26,4 +25,3 @@ if command -v node; then
 else
   ! nvm_has_system_node
 fi
-

test/fast/Unit tests/nvm_print_implicit_alias success

@@ -2,25 +2,25 @@
 
 die () { echo $@ ; cleanup ; exit 1; }
 cleanup() {
-  rm -rf ../../../v0.2.3
-  rm -rf ../../../v0.3.4
-  rm -rf ../../../v0.4.6
-  rm -rf ../../../v0.5.7
-  rm -rf ../../../v0.7.7
-  rm -rf ../../../versions/io.js/v0.98.0
-  rm -rf ../../../versions/node/v1.0.0
-  rm -rf ../../../versions/node/v1.1.0
+  rm -rf "${NVM_DIR}/v0.2.3"
+  rm -rf "${NVM_DIR}/v0.3.4"
+  rm -rf "${NVM_DIR}/v0.4.6"
+  rm -rf "${NVM_DIR}/v0.5.7"
+  rm -rf "${NVM_DIR}/v0.7.7"
+  rm -rf "${NVM_DIR}/versions/io.js/v0.98.0"
+  rm -rf "${NVM_DIR}/versions/node/v1.0.0"
+  rm -rf "${NVM_DIR}/versions/node/v1.1.0"
   unset -f nvm_ls_remote nvm_ls_remote_iojs
 }
 
 . ../../../nvm.sh
 
-mkdir ../../../v0.2.3
-mkdir ../../../v0.3.4
-mkdir ../../../v0.4.6
-mkdir ../../../v0.5.7
-mkdir ../../../v0.7.7
-mkdir -p ../../../versions/io.js/v0.98.0
+mkdir "${NVM_DIR}/v0.2.3"
+mkdir "${NVM_DIR}/v0.3.4"
+mkdir "${NVM_DIR}/v0.4.6"
+mkdir "${NVM_DIR}/v0.5.7"
+mkdir "${NVM_DIR}/v0.7.7"
+mkdir -p "${NVM_DIR}/versions/io.js/v0.98.0"
 
 LATEST_STABLE="$(nvm_print_implicit_alias local stable)"
 [ "_$LATEST_STABLE" = "_0.4" ] || die "local stable is not latest even minor: expected 0.4, got $LATEST_STABLE"
@@ -35,8 +35,8 @@ LATEST_IOJS="$(nvm_print_implicit_alias local iojs)"
 [ "_$LATEST_IOJS" = "_iojs-v0.98" ] || die "local iojs is not latest iojs: expected iojs-v0.98, got $LATEST_IOJS"
 
 ## node post v1.0/io.js merger ##
-mkdir -p ../../../versions/node/v1.0.0
-mkdir -p ../../../versions/node/v1.1.0
+mkdir -p "${NVM_DIR}/versions/node/v1.0.0"
+mkdir -p "${NVM_DIR}/versions/node/v1.1.0"
 
 LATEST_STABLE="$(nvm_print_implicit_alias local stable)"
 [ "_$LATEST_STABLE" = "_1.1" ] || die "local stable when post-v1.0 exists is not latest: expected 1.1, got $LATEST_STABLE"
@@ -102,4 +102,3 @@ LATEST_UNSTABLE="$(nvm_print_implicit_alias remote unstable)"
 ## ** ##
 
 cleanup
-