ld/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2025-06-27 11:38:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Normalize paths in nvm_tree_contains_path before comparing

Browse Source 
It's possible that `tree` and `node_path` both refer to the same
directory, but are lexically different. This converts both paths
into a canonical form so that any lexical-only differences are
removed.

This solves a problem where setting `NVM_DIR` to /home/user//.nvm
instead of /home/user/.nvm results in the infamous:
nvm is not compatible with the npm config "prefix" option

This adds a test that the above case no longer results in an error. An
existing test stopped failing as expected as a result, as the test set
the npm prefix to a local-directory-relative path, which resolved to
a directory inside the `NVM_DIR` when running the tests from within the
`NVM_DIR`. This test is updated to use an absolute path.
This commit is contained in:
Stephen Sherratt 2019-05-11 15:20:47 +01:00 committed by Jordan Harband
parent c26bd935c0
commit e77cead149
No known key found for this signature in database
GPG Key ID: 9F6A681E35EF8B56
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nvm.sh
View File

@ -317,9 +317,9 @@ unset NVM_SCRIPT_SOURCE 2>/dev/null
nvm_tree_contains_path() { nvm_tree_contains_path() {
local tree local tree
tree="${1-}" tree=$(realpath --canonicalize-missing "${1-}")
local node_path local node_path
node_path="${2-}" node_path=$(realpath --canonicalize-missing "${2-}")
if [ "@${tree}@" = "@@" ] || [ "@${node_path}@" = "@@" ]; then if [ "@${tree}@" = "@@" ] || [ "@${node_path}@" = "@@" ]; then
nvm_err "both the tree and the node path are required" nvm_err "both the tree and the node path are required"

14
test/fast/Unit tests/nvm_die_on_prefix
View File

@ -186,4 +186,18 @@ Run \`foo\` to unset it."
[ "_$EXIT_CODE" = "_10" ] || die "'nvm_die_on_prefix 0 foo' with user .npmrc that has globalconfig did not exit with 10; got '$EXIT_CODE'" [ "_$EXIT_CODE" = "_10" ] || die "'nvm_die_on_prefix 0 foo' with user .npmrc that has globalconfig did not exit with 10; got '$EXIT_CODE'"
) )
npm() {
local args
args="$@"
if [ "_$args" = "_config --loglevel=warn get prefix" ]; then
echo "/home/foo/.nvm/path/to/version"
fi
}
NON_NORMALIZED_NVM_DIR="//home//foo//.nvm/"
OUTPUT="$(export NVM_DIR="$NON_NORMALIZED_NVM_DIR" ; nvm_die_on_prefix 0 foo 2>&1)"
EXPECTED_OUTPUT=''
EXIT_CODE="$(export NVM_DIR="$NON_NORMALIZED_NVM_DIR" ; nvm_die_on_prefix 0 foo >/dev/null 2>&1; echo $?)"
[ "_$OUTPUT" = "_$EXPECTED_OUTPUT" ] || die "'nvm_die_on_prefix 0 foo' did not error with '$EXPECTED_OUTPUT' with non-normalized NVM_DIR; got '$OUTPUT'"
[ "_$EXIT_CODE" = "_0" ] || die "'nvm_die_on_prefix 0 foo' did not exit with 0 with non-normalized NVM_DIR; got '$EXIT_CODE'"
cleanup cleanup