Skip to content

Commit df9ac58

Browse files
committed
[Fix] reinstall-packages: do not reinstall corepack
Fixes #3544
1 parent 8dbc22f commit df9ac58

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

nvm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2740,7 +2740,7 @@ nvm_npm_global_modules() {
27402740
NPMLIST=$(nvm use "${VERSION}" >/dev/null && npm list -g --depth=0 2>/dev/null | command sed -e '1d' -e '/UNMET PEER DEPENDENCY/d')
27412741

27422742
local INSTALLS
2743-
INSTALLS=$(nvm_echo "${NPMLIST}" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*@[^ ]*\).*/\1/' -e '/^npm@[^ ]*.*$/ d' | command xargs)
2743+
INSTALLS=$(nvm_echo "${NPMLIST}" | command sed -e '/ -> / d' -e '/\(empty\)/ d' -e 's/^.* \(.*@[^ ]*\).*/\1/' -e '/^npm@[^ ]*.*$/ d' -e '/^corepack@[^ ]*.*$/ d' | command xargs)
27442744

27452745
local LINKS
27462746
LINKS="$(nvm_echo "${NPMLIST}" | command sed -n 's/.* -> \(.*\)/\1/ p')"

test/slow/nvm reinstall-packages/should work as expected

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ EXPECTED_PACKAGES_INSTALL="autoprefixer bower david@11 grunt-cli grunth-cli http
1616
echo "$EXPECTED_PACKAGES_INSTALL" | sed -e 's/test-npmlink //' | xargs npm install -g --quiet
1717

1818
get_packages() {
19-
npm list -g --depth=0 | \sed -e '1 d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | xargs
19+
npm list -g --depth=0 | \sed -e '1 d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' -e '/^corepack$/ d' | xargs
2020
}
2121

2222
nvm use 0.10.29

test/slow/nvm reinstall-packages/works with no installs

+12-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ die () { echo "$@" ; exit 1; }
55
\. ../../../nvm.sh
66

77
get_packages() {
8-
npm list -g --depth=0 | \sed -e '1 d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' | xargs
8+
npm list -g --depth=0 | \sed -e '1 d' -e 's/^.* \(.*\)@.*/\1/' -e '/^npm$/ d' -e '/^corepack$/ d' | xargs
99
}
1010

1111
nvm use 4.7.2
@@ -14,5 +14,14 @@ ORIGINAL_PACKAGES=$(get_packages)
1414
nvm reinstall-packages 4.7.1
1515
FINAL_PACKAGES=$(get_packages)
1616

17-
[ -z "${ORIGINAL_PACKAGES}" ] || die "original packages were not empty: ${ORIGINAL_PACKAGES}"
18-
[ -z "${FINAL_PACKAGES}" ] || die "final packages were not empty: ${FINAL_PACKAGES}"
17+
[ -z "${ORIGINAL_PACKAGES}" ] || die "v4: original packages were not empty: ${ORIGINAL_PACKAGES}"
18+
[ -z "${FINAL_PACKAGES}" ] || die "v4: final packages were not empty: ${FINAL_PACKAGES}"
19+
20+
nvm use 23.8.20
21+
ORIGINAL_PACKAGES=$(get_packages)
22+
23+
nvm reinstall-packages 23.8.0
24+
FINAL_PACKAGES=$(get_packages)
25+
26+
[ -z "${ORIGINAL_PACKAGES}" ] || die "v23: original packages were not empty: ${ORIGINAL_PACKAGES}"
27+
[ -z "${FINAL_PACKAGES}" ] || die "v23: final packages were not empty: ${FINAL_PACKAGES}"

0 commit comments

Comments
 (0)