Actual fix for Windows path issue

rescript-lang · Jun 16, 2024 · 5852e5b · 5852e5b
1 parent 82d5195
commit 5852e5b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -26,7 +26,7 @@ jobs:
             macos-14, # ARM
             ubuntu-latest, # x64
             buildjet-2vcpu-ubuntu-2204-arm, # ARM
-            # windows-latest, # deactivated for now as there is still a Windows issue
+            windows-latest,
           ]
 
     runs-on: ${{matrix.os}}

diff --git a/src/RescriptVersions.res b/src/RescriptVersions.res
@@ -66,7 +66,14 @@ let promptVersions = async () => {
 let installVersions = async ({rescriptVersion, rescriptCoreVersion}) => {
   let packageManager = PackageManagers.getActivePackageManager()
   let packages = [`rescript@${rescriptVersion}`, `@rescript/core@${rescriptCoreVersion}`]
-  let command = `${packageManager} add ${packages->Array.join(" ")}`
+
+  // #58: Windows: packageManager may be something like
+  // "C:\Program Files\nodejs\node_modules\npm\bin\npm-cli.js".
+  //
+  // Therefore, packageManager needs to be in quotes, and we need to prepend "node "
+  // if packageManager points to a JS file, otherwise the invocation will hang.
+  let maybeNode = packageManager->String.endsWith("js") ? "node " : ""
+  let command = `${maybeNode}"${packageManager}" add ${packages->Array.join(" ")}`
 
   let _ = await Node.Promisified.ChildProcess.exec(command)
 }