[Fix] install.sh: nvm_check_global_modules: don't run a Windows npm under WSL
Under WSL, `PATH` can include a Windows Node install, so `command -v npm` can find its `npm` shell shim, which then failed against Windows paths. That npm is not a system node that nvm would shadow, so under WSL, skip an npm that has an `npm.cmd` beside it: both the Node installer and npm's own shims put one there. Outside WSL (eg, Git Bash or Cygwin), a Windows npm is the system node, so the warning is kept. Fixes #3700. Signed-off-by: NUAAwqy <146524024+NUAAwqy@users.noreply.github.com> Co-Authored-By: Codex <noreply@openai.com>
This commit is contained in:
1 parent
3fda4d5542
commit
f0d372b01b
3 files changed
+79
-2
No files matched your search
@@ -5,11 +5,12 @@ cleanup () {
|
||||
unset npm_config_prefix
|
||||
|
||||
rm -f npm
|
||||
[ -z "${WINDOWS_NPM_DIR-}" ] || rm -rf "${WINDOWS_NPM_DIR}"
|
||||
PATH="$ORIGINAL_PATH"
|
||||
NVM_DIR="$ORIGINAL_NVM_DIR"
|
||||
|
||||
unset -f setup cleanup die
|
||||
unset message ORIGINAL_PATH ORIGINAL_NVM_DIR
|
||||
unset message ORIGINAL_PATH ORIGINAL_NVM_DIR WINDOWS_NPM_DIR
|
||||
}
|
||||
die () { echo "$@" ; cleanup ; exit 1; }
|
||||
|
||||
@@ -61,5 +62,26 @@ chmod +x npm
|
||||
message=$(nvm_check_global_modules)
|
||||
[ -z "$message" ] || die "nvm_check_global_modules should have not printed a notice when npm was unavailable; got:\n${message}"
|
||||
|
||||
# Faking a Windows Node's npm, with a global module installed
|
||||
WINDOWS_NPM_DIR="$(mktemp -d)"
|
||||
cat <<'SH' >"${WINDOWS_NPM_DIR}/npm"
|
||||
#!/bin/sh
|
||||
case "$1" in
|
||||
--version) echo '10.0.0' ;;
|
||||
list) printf '%s\n' 'npm@10.0.0' '└── windows-global@1.0.0' ;;
|
||||
esac
|
||||
SH
|
||||
touch "${WINDOWS_NPM_DIR}/npm.cmd"
|
||||
chmod +x "${WINDOWS_NPM_DIR}/npm"
|
||||
PATH="${WINDOWS_NPM_DIR}:${ORIGINAL_PATH}"
|
||||
|
||||
nvm_is_wsl() { return 0; }
|
||||
message=$(nvm_check_global_modules)
|
||||
[ -z "$message" ] || die "nvm_check_global_modules should not run a Windows npm under WSL; got:\n${message}"
|
||||
|
||||
nvm_is_wsl() { return 1; }
|
||||
message=$(nvm_check_global_modules)
|
||||
[ -n "$message" ] || die 'nvm_check_global_modules should still warn about a Windows npm outside WSL, where it is the system node'
|
||||
|
||||
|
||||
cleanup
|
||||
Executable
+40
@@ -0,0 +1,40 @@
|
||||
#!/bin/sh
|
||||
|
||||
cleanup () {
|
||||
rm -rf "${FAKE_BIN_DIR}"
|
||||
PATH="$ORIGINAL_PATH"
|
||||
unset -f cleanup die fake_uname
|
||||
unset ORIGINAL_PATH FAKE_BIN_DIR
|
||||
}
|
||||
die () { echo "$@" ; cleanup ; exit 1; }
|
||||
|
||||
NVM_ENV=testing \. ../../install.sh
|
||||
|
||||
ORIGINAL_PATH="$PATH"
|
||||
FAKE_BIN_DIR="$(mktemp -d)"
|
||||
PATH="${FAKE_BIN_DIR}:${PATH}"
|
||||
|
||||
fake_uname() {
|
||||
printf '#!/bin/sh\necho %s\n' "$1" > "${FAKE_BIN_DIR}/uname"
|
||||
chmod +x "${FAKE_BIN_DIR}/uname"
|
||||
}
|
||||
|
||||
type nvm_is_wsl > /dev/null 2>&1 || die 'nvm_is_wsl is not available'
|
||||
|
||||
fake_uname '6.6.87.2-microsoft-standard-WSL2'
|
||||
nvm_is_wsl || die 'a WSL2 kernel release should be detected as WSL'
|
||||
|
||||
fake_uname '4.4.0-19041-Microsoft'
|
||||
nvm_is_wsl || die 'a WSL1 kernel release should be detected as WSL'
|
||||
|
||||
if [ -e /proc/sys/fs/binfmt_misc/WSLInterop ] || [ -e /proc/sys/fs/binfmt_misc/WSLInterop-late ]; then
|
||||
echo 'skipping the non-WSL checks: this machine has a WSL interop entry'
|
||||
else
|
||||
fake_uname '6.8.0-45-generic'
|
||||
! nvm_is_wsl || die 'a non-WSL kernel release should not be detected as WSL'
|
||||
|
||||
fake_uname '24.5.0'
|
||||
! nvm_is_wsl || die 'a macOS kernel release should not be detected as WSL'
|
||||
fi
|
||||
|
||||
cleanup
|
||||
Reference in new issue
Block a user