Skip to content

Commit 0ad5a45

Browse files
committed
Put node versions >= 0.12 in versions/node instead of just versions
1 parent d5e21be commit 0ad5a45

6 files changed

+6
-6
lines changed

nvm.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ nvm_version_dir() {
143143
local NVM_WHICH_DIR
144144
NVM_WHICH_DIR="$1"
145145
if [ -z "$NVM_WHICH_DIR" ] || [ "_$NVM_WHICH_DIR" = "_new" ]; then
146-
echo "$NVM_DIR/versions"
146+
echo "$NVM_DIR/versions/node"
147147
elif [ "_$NVM_WHICH_DIR" = "_old" ]; then
148148
echo "$NVM_DIR"
149149
else

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mkdir -p ../../../v0.0.2
44
mkdir -p ../../../v0.0.20
5-
mkdir -p ../../../versions/v0.12.0
5+
mkdir -p ../../../versions/node/v0.12.0
66

77
. ../../../nvm.sh
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
mkdir ../../../v0.1.3
44
mkdir ../../../v0.2.3
5-
mkdir ../../../versions
5+
mkdir -p ../../../versions/node
66

77
. ../../../nvm.sh
88

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
die () { echo $@ ; exit 1; }
44

5-
mkdir -p ../../../versions/v0.12.1
5+
mkdir -p ../../../versions/node/v0.12.1
66
mkdir ../../../v0.1.3
77

88
. ../../../nvm.sh

test/fast/Unit tests/nvm_version_dir

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ die () { echo $@ ; exit 1; }
44

55
. ../../../nvm.sh
66

7-
[ "$(nvm_version_dir)" = "$NVM_DIR/versions" ] || die '"nvm_version_dir" did not return new dir path'
7+
[ "$(nvm_version_dir)" = "$NVM_DIR/versions/node" ] || die '"nvm_version_dir" did not return new dir path'
88
[ "$(nvm_version_dir new)" = "$(nvm_version_dir)" ] || die '"nvm_version_dir new" did not return new dir path'
99
[ "$(nvm_version_dir old)" = "$NVM_DIR" ] || die '"nvm_version_dir old" did not return old dir path'
1010
[ "$(nvm_version_dir foo 2>&1)" = "unknown version dir" ] || die '"nvm_version_dir foo" did not error out'

test/fast/Unit tests/nvm_version_path

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ die () { echo $@ ; exit 1; }
77
[ "$(nvm_version_path foo)" = "$NVM_DIR/foo" ] || die '"nvm_version_path foo" did not return correct location'
88
[ "$(nvm_version_path 2>&1)" = "version is required" ] || die '"nvm_version_path" did not error out'
99
[ "$(nvm_version_path v0.11.0)" = "$NVM_DIR/v0.11.0" ] || die 'old version has the wrong path'
10-
[ "$(nvm_version_path v0.12.0)" = "$NVM_DIR/versions/v0.12.0" ] || die 'new version has the wrong path'
10+
[ "$(nvm_version_path v0.12.0)" = "$NVM_DIR/versions/node/v0.12.0" ] || die 'new version has the wrong path'
1111

0 commit comments

Comments
 (0)