eeymoo/nvm
1
0
Fork 0
mirror of https://github.com/nvm-sh/nvm.git synced 2026-07-18 12:58:21 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Fix] Parse commented nvmrc content in nvm_ls

Browse Source 
Fixes #3761

Signed-off-by: jinhyuk9714 <jinhyuk9714@gmail.com>
This commit is contained in:
jinhyuk9714
2026-06-09 00:21:55 +09:00
committed by Jordan Harband
parent ab77712867
commit 82315e2b18
2 changed files with 52 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nvm.sh
+23 -5
View File
@@ -560,12 +560,12 @@ ${1}"
$(nvm_wrap_with_color_code 'y' "${warn_text}")"
}
nvm_process_nvmrc() {
local NVMRC_PATH
NVMRC_PATH="$1"
nvm_process_nvmrc_content() {
local NVMRC_CONTENT
NVMRC_CONTENT="${1-}"
local lines
lines=$(command sed 's/#.*//' "$NVMRC_PATH" | command sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | nvm_grep -v '^$')
lines=$(nvm_echo "${NVMRC_CONTENT}" | command sed 's/#.*//' | command sed 's/^[[:space:]]*//;s/[[:space:]]*$//' | nvm_grep -v '^$')
if [ -z "$lines" ]; then
nvm_nvmrc_invalid_msg "${lines}"
@@ -629,6 +629,13 @@ EOF
nvm_echo "${unpaired_line}"
}
nvm_process_nvmrc() {
local NVMRC_PATH
NVMRC_PATH="$1"
nvm_process_nvmrc_content "$(command cat "${NVMRC_PATH}")"
}
nvm_rc_version() {
local NVMRC_PATH
NVMRC_PATH="$(nvm_find_nvmrc)"
@@ -1486,6 +1493,17 @@ nvm_strip_iojs_prefix() {
nvm_ls() {
local PATTERN
PATTERN="${1-}"
case "${PATTERN}" in
*'#'* | *'
'*)
local NVMRC_PATTERN
if ! NVMRC_PATTERN="$(nvm_process_nvmrc_content "${PATTERN}" 2>/dev/null)"; then
nvm_echo 'N/A'
return 3
fi
PATTERN="${NVMRC_PATTERN}"
;;
esac
local VERSIONS
VERSIONS=''
if [ "${PATTERN}" = 'current' ]; then
@@ -4717,7 +4735,7 @@ nvm() {
nvm_get_colors nvm_set_colors nvm_print_color_code nvm_wrap_with_color_code nvm_format_help_message_colors \
nvm_echo_with_colors nvm_err_with_colors \
nvm_get_artifact_compression nvm_install_binary_extract nvm_extract_tarball \
nvm_process_nvmrc nvm_nvmrc_invalid_msg \
nvm_process_nvmrc nvm_process_nvmrc_content nvm_nvmrc_invalid_msg \
nvm_write_nvmrc \
>/dev/null 2>&1
unset NVM_NODEJS_ORG_MIRROR NVM_IOJS_ORG_MIRROR NVM_DIR \
test/fast/Unit tests/nvm_ls handles hash in pattern
+29 -1
View File
@@ -1,6 +1,11 @@
#!/bin/sh
die () { echo "$@" ; exit 1; }
die () { echo "$@" ; cleanup ; exit 1; }
cleanup() {
unset NVMRC_CONTENT OUTPUT EXIT_CODE TEST_DIR
rm -rf "${TEST_DIR-}"
}
: nvm.sh
\. ../../../nvm.sh
@@ -22,3 +27,26 @@ echo "$OUTPUT" | grep -q "invalid command code" && \
# Should return N/A with exit code 3 (not found)
[ "$EXIT_CODE" = "3" ] || die "nvm_ls 'foo#bar' should exit with code 3, got $EXIT_CODE"
echo "$OUTPUT" | grep -q "N/A" || die "nvm_ls 'foo#bar' should output N/A, got: $OUTPUT"
TEST_DIR="${PWD}/nvm_ls_hash_pattern_tmp"
mkdir -p "${TEST_DIR}/versions/node/v24.13.0/bin" || die 'failed to create test version dir'
printf '#!/bin/sh\nprintf v24.13.0\\\\n\n' > "${TEST_DIR}/versions/node/v24.13.0/bin/node" || die 'failed to create test node binary'
chmod +x "${TEST_DIR}/versions/node/v24.13.0/bin/node" || die 'failed to chmod test node binary'
NVM_DIR="${TEST_DIR}"
NVMRC_CONTENT='v24.13.0
# krypton is the codename for Node.js v24.x'
OUTPUT="$(nvm_ls "${NVMRC_CONTENT}" 2>&1)"
EXIT_CODE=$?
echo "$OUTPUT" | grep -q "unterminated regular expression" && \
die "nvm_ls with .nvmrc comments caused sed 'unterminated regular expression' error: $OUTPUT"
[ "$EXIT_CODE" = "0" ] || die "nvm_ls with .nvmrc comments should exit with code 0, got $EXIT_CODE"
[ "$OUTPUT" = "v24.13.0" ] || die "nvm_ls with .nvmrc comments should output v24.13.0, got: $OUTPUT"
OUTPUT="$(nvm_version "${NVMRC_CONTENT}" 2>&1)"
[ "$OUTPUT" = "v24.13.0" ] || die "nvm_version with .nvmrc comments should output v24.13.0, got: $OUTPUT"
cleanup