[Perf] nvm_ls: only look for a system node when the pattern can list it
`nvm_ls` lists the system version only for an empty pattern, `v`, or `system`, but it checked for a system node/io.js for every pattern. Each check runs `nvm deactivate` in a subshell, and a found system node also runs `node -v`. So every partial-version lookup, like resolving a `default` alias of `24` on shell startup, did that work and discarded it. Refs #3425, #3416. Signed-off-by: Wei-Lun Li <b84330808@gmail.com>
This commit is contained in:
1 parent
e759a03ee4
commit
a2c0ebaec1
2 files changed
+70
-6
No files matched your search
@@ -2543,9 +2543,14 @@ nvm_ls() {
|
||||
if nvm_is_iojs_version "${PATTERN}"; then
|
||||
NVM_DIRS_TO_SEARCH1="${NVM_VERSION_DIR_IOJS}"
|
||||
PATTERN="$(nvm_strip_iojs_prefix "${PATTERN}")"
|
||||
if nvm_has_system_iojs; then
|
||||
NVM_ADD_SYSTEM=true
|
||||
fi
|
||||
# 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
|
||||
elif [ "${PATTERN}" = "${NVM_NODE_PREFIX}-" ]; then
|
||||
NVM_DIRS_TO_SEARCH1="${NVM_VERSION_DIR_OLD}"
|
||||
NVM_DIRS_TO_SEARCH2="${NVM_VERSION_DIR_NEW}"
|
||||
@@ -2557,9 +2562,14 @@ nvm_ls() {
|
||||
NVM_DIRS_TO_SEARCH1="${NVM_VERSION_DIR_OLD}"
|
||||
NVM_DIRS_TO_SEARCH2="${NVM_VERSION_DIR_NEW}"
|
||||
NVM_DIRS_TO_SEARCH3="${NVM_VERSION_DIR_IOJS}"
|
||||
if nvm_has_system_iojs || nvm_has_system_node; then
|
||||
NVM_ADD_SYSTEM=true
|
||||
fi
|
||||
# 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
|
||||
fi
|
||||
|
||||
if ! [ -d "${NVM_DIRS_TO_SEARCH1}" ] || ! (command ls -1q "${NVM_DIRS_TO_SEARCH1}" | nvm_grep -q .); then
|
||||
|
||||
+54
@@ -0,0 +1,54 @@
|
||||
#!/bin/sh
|
||||
|
||||
die () { echo "$@" ; cleanup ; exit 1; }
|
||||
|
||||
cleanup() {
|
||||
rm -rf "${TEST_DIR-}"
|
||||
unset -f nvm_has_system_node nvm_has_system_iojs node
|
||||
unset TEST_DIR NVM_DIR SYSTEM_CHECKS OUTPUT
|
||||
}
|
||||
|
||||
: nvm.sh
|
||||
\. ../../../nvm.sh
|
||||
|
||||
\. ../../common.sh
|
||||
|
||||
# an isolated NVM_DIR with known versions
|
||||
TEST_DIR="${PWD}/nvm_ls_system_check_tmp"
|
||||
for VERSION in v20.0.0 v24.13.0; do
|
||||
mkdir -p "${TEST_DIR}/versions/node/${VERSION}/bin" || die "failed to create ${VERSION} dir"
|
||||
make_echo "${TEST_DIR}/versions/node/${VERSION}/bin/node" "${VERSION}" || die "failed to create ${VERSION} node binary"
|
||||
done
|
||||
unset VERSION
|
||||
NVM_DIR="${TEST_DIR}"
|
||||
|
||||
# each check runs `nvm deactivate` in a subshell, so count them
|
||||
SYSTEM_CHECKS=0
|
||||
nvm_has_system_node() { SYSTEM_CHECKS=$((SYSTEM_CHECKS + 1)); return 0; }
|
||||
nvm_has_system_iojs() { SYSTEM_CHECKS=$((SYSTEM_CHECKS + 1)); return 1; }
|
||||
node() { echo 'v18.0.0'; }
|
||||
|
||||
# a partial version never lists the system version, so it should not check for one
|
||||
nvm_ls 24 > "${TEST_DIR}/output" || die '`nvm_ls 24` failed'
|
||||
OUTPUT="$(cat "${TEST_DIR}/output")"
|
||||
[ "_${OUTPUT}" = '_v24.13.0' ] || die "\`nvm_ls 24\` should output >v24.13.0<; got >${OUTPUT}<"
|
||||
[ "${SYSTEM_CHECKS}" = 0 ] || die "\`nvm_ls 24\` should not check for a system version; checked ${SYSTEM_CHECKS} times"
|
||||
|
||||
nvm_ls iojs-v3 > "${TEST_DIR}/output"
|
||||
[ "${SYSTEM_CHECKS}" = 0 ] || die "\`nvm_ls iojs-v3\` should not check for a system version; checked ${SYSTEM_CHECKS} times"
|
||||
|
||||
# these patterns still list it
|
||||
nvm_ls > "${TEST_DIR}/output" || die '`nvm_ls` failed'
|
||||
OUTPUT="$(cat "${TEST_DIR}/output")"
|
||||
[ "_${OUTPUT}" = "_v20.0.0
|
||||
v24.13.0
|
||||
system v18.0.0" ] || die "\`nvm_ls\` should list the system version; got >${OUTPUT}<"
|
||||
[ "${SYSTEM_CHECKS}" != 0 ] || die '`nvm_ls` should check for a system version'
|
||||
|
||||
SYSTEM_CHECKS=0
|
||||
nvm_ls system > "${TEST_DIR}/output" || die '`nvm_ls system` failed'
|
||||
OUTPUT="$(cat "${TEST_DIR}/output")"
|
||||
[ "_${OUTPUT}" = '_system v18.0.0' ] || die "\`nvm_ls system\` should output >system v18.0.0<; got >${OUTPUT}<"
|
||||
[ "${SYSTEM_CHECKS}" != 0 ] || die '`nvm_ls system` should check for a system version'
|
||||
|
||||
cleanup
|
||||
Reference in new issue
Block a user