From 68986f7778a18b39e5be55947a5c5fc698725efa Mon Sep 17 00:00:00 2001 From: Jordan Harband Date: Tue, 17 Nov 2026 10:22:51 -0800 Subject: [PATCH] [Refactor] `nvm_ls`: check for a system version where it is listed Each branch now only records which system binary applies, and the check runs in the block that lists the system version, so the patterns that list it are named in one place. --- nvm.sh | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/nvm.sh b/nvm.sh index d8f15318..3da8e71a 100755 --- a/nvm.sh +++ b/nvm.sh @@ -2538,38 +2538,22 @@ nvm_ls() { NVM_DIRS_TO_SEARCH2='' local NVM_DIRS_TO_SEARCH3 NVM_DIRS_TO_SEARCH3='' - local NVM_ADD_SYSTEM - NVM_ADD_SYSTEM=false + local NVM_SYSTEM_CHECK + NVM_SYSTEM_CHECK='' if nvm_is_iojs_version "${PATTERN}"; then NVM_DIRS_TO_SEARCH1="${NVM_VERSION_DIR_IOJS}" PATTERN="$(nvm_strip_iojs_prefix "${PATTERN}")" - # only these patterns list the system version, at the end of this function - case "${PATTERN}" in - '' | v | system) - if nvm_has_system_iojs; then - NVM_ADD_SYSTEM=true - fi - ;; - esac + NVM_SYSTEM_CHECK='iojs' elif [ "${PATTERN}" = "${NVM_NODE_PREFIX}-" ]; then NVM_DIRS_TO_SEARCH1="${NVM_VERSION_DIR_OLD}" NVM_DIRS_TO_SEARCH2="${NVM_VERSION_DIR_NEW}" PATTERN='' - if nvm_has_system_node; then - NVM_ADD_SYSTEM=true - fi + NVM_SYSTEM_CHECK='node' else NVM_DIRS_TO_SEARCH1="${NVM_VERSION_DIR_OLD}" NVM_DIRS_TO_SEARCH2="${NVM_VERSION_DIR_NEW}" NVM_DIRS_TO_SEARCH3="${NVM_VERSION_DIR_IOJS}" - # only these patterns list the system version, at the end of this function - case "${PATTERN}" in - '' | v | system) - if nvm_has_system_iojs || nvm_has_system_node; then - NVM_ADD_SYSTEM=true - fi - ;; - esac + NVM_SYSTEM_CHECK='any' fi if ! [ -d "${NVM_DIRS_TO_SEARCH1}" ] || ! (command ls -1q "${NVM_DIRS_TO_SEARCH1}" | nvm_grep -q .); then @@ -2643,7 +2627,19 @@ nvm_ls() { VERSIONS="$(nvm_echo "${VERSIONS}" | nvm_filter_installed_versions)" fi - if [ "${NVM_ADD_SYSTEM-}" = true ]; then + # each check runs `nvm deactivate` in a subshell, so only check for the patterns that list the system version + local NVM_ADD_SYSTEM + NVM_ADD_SYSTEM=false + case "${PATTERN}" in + '' | v | system) + case "${NVM_SYSTEM_CHECK-}" in + iojs) if nvm_has_system_iojs; then NVM_ADD_SYSTEM=true; fi ;; + node) if nvm_has_system_node; then NVM_ADD_SYSTEM=true; fi ;; + any) if nvm_has_system_iojs || nvm_has_system_node; then NVM_ADD_SYSTEM=true; fi ;; + esac + ;; + esac + if [ "${NVM_ADD_SYSTEM}" = true ]; then local SYSTEM_VERSION SYSTEM_VERSION="$(nvm deactivate >/dev/null 2>&1 && node -v 2>/dev/null)" case "${PATTERN}" in