Only remove npm.ps1 if it exists

mongodb-js · Nov 8, 2024 · 74c9856 · 74c9856
1 parent a845126
commit 74c9856
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/.evergreen/InstallNode.ps1 b/.evergreen/InstallNode.ps1
@@ -20,7 +20,7 @@ Get-ChildItem -Path $PSScriptRoot
 Set-Location -Path $node_dir
 Remove-Item .\npm
 Remove-Item .\npm.cmd
-Remove-Item .\npm.ps1
+if (Test-Item .\npm.ps1) { Remove-Item .\npm.ps1 }
 Remove-Item .\npx
 Remove-Item .\npx.cmd
 Move-Item .\node_modules\npm -Destination .\node_modules\npm2

diff --git a/.evergreen/install-node.sh b/.evergreen/install-node.sh
@@ -2,7 +2,11 @@ set -e
 set -x
 export BASEDIR="$PWD/.evergreen"
 
-NPM_VERSION=10.8.3 # 10.9.0 does not install well on Windows
+if echo $NODE_JS_VERSION | grep -q ^20 ; then
+  NPM_VERSION=10.8.3 # 10.9.0 does not install well on Windows
+else
+  NPM_VERSION=10.9.0
+fi
 
 if [ "$OS" == "Windows_NT" ]; then
   powershell "$(cygpath -w "$BASEDIR")"/InstallNode.ps1