MSYS support on Windows

ManasJayanth · Jun 8, 2024 · 1846731 · 1846731
1 parent 53a5ab7
commit 1846731
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -9,3 +9,5 @@ Needs Powershell 7
 ## Development
 
 (Currently Windows only) Set `NODE_ENV` to `development` to enable sourcemaps at the node wrapper. Not useful inside the JS realm.
+
+You'll need MSYS - Set $env:PATH to `$env:PATH = "C:\msys64\usr\bin;" + $env:PATH`. GitBash support is unreliable. MSYS is more reliable.
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -14,10 +14,20 @@ export async function cygpath(path: string) {
   try {
     platform = await uname();
   } catch (e) {
-    platform = "Windows";
+    platform = "";
   }
 
-  if (/cygwin/i.test(platform) || /mingw/i.test(platform)) {
+  // uname : GitBash from Terminal returns
+  // MINGW64_NT-10.0-xxx DESKTOP-xxx 3.4.10-xxx.x86_64 2024-02-14 20:17 UTC x86_64 Msys
+
+  // uname: from child_process.spawn
+  // MSYS_NT-10.0-xxx DESKTOP-xxx 3.4.10-xxx.x86_64 2024-02-14 20:17 UTC x86_64 Msys
+
+  if (
+    /msys/i.test(platform) ||
+    /cygwin/i.test(platform) ||
+    /mingw/i.test(platform)
+  ) {
     path = cp.execSync(`cygpath -u ${path}`).toString().trim();
   }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -9,3 +9,5 @@ Needs Powershell 7
		## Development

		(Currently Windows only) Set `NODE_ENV` to `development` to enable sourcemaps at the node wrapper. Not useful inside the JS realm.

		You'll need MSYS - Set $env:PATH to `$env:PATH = "C:\msys64\usr\bin;" + $env:PATH`. GitBash support is unreliable. MSYS is more reliable.