mirror of
https://github.com/nvm-sh/nvm.git
synced 2026-07-18 21:08:23 +08:00
[Fix] Parse commented nvmrc content in nvm_ls
Fixes #3761 Signed-off-by: jinhyuk9714 <jinhyuk9714@gmail.com>
This commit is contained in:
@@ -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 \
|
||||
|
||||
Reference in New Issue
Block a user