From 54a5822ce8133ee101ee675184481c9145785d72 Mon Sep 17 00:00:00 2001
From: Scott Trinh <scott@edgedb.com>
Date: Mon, 15 Apr 2024 11:37:57 -0400
Subject: [PATCH] Better Windows support for wrapper (#958)

Does a better job of perserving a cross-platform path, and updates the
self-reference check to skip any Windows scripts which is how the
`package.json#bin` option works on Windows rather than a symlink.
---
 packages/driver/src/cli.mts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/driver/src/cli.mts b/packages/driver/src/cli.mts
index b5168bb04..9c8da1d9f 100644
--- a/packages/driver/src/cli.mts
+++ b/packages/driver/src/cli.mts
@@ -4,6 +4,7 @@ import { createWriteStream } from "node:fs";
 import * as os from "node:os";
 import * as fs from "node:fs/promises";
 import * as path from "node:path";
+import { fileURLToPath } from "node:url";
 import * as process from "node:process";
 import * as semver from "semver";
 import envPaths from "env-paths";
@@ -13,6 +14,7 @@ import which from "which";
 const debug = Debug("edgedb:cli");
 
 const IS_TTY = process.stdout.isTTY;
+const SCRIPT_LOCATION = await fs.realpath(fileURLToPath(import.meta.url));
 const EDGEDB_PKG_ROOT = "https://packages.edgedb.com";
 const CACHE_DIR = envPaths("edgedb").cache;
 const TEMPORARY_CLI_PATH = path.join(CACHE_DIR, "/edgedb-cli");
@@ -50,7 +52,7 @@ try {
 }
 
 async function main(args: string[]) {
-  debug(`Running CLI wrapper from: ${new URL(import.meta.url).pathname}`);
+  debug(`Running CLI wrapper from: ${fileURLToPath(import.meta.url)}`);
   debug("Starting main function with args:", args);
   const cliLocation =
     (await whichEdgeDbCli()) ??
@@ -75,11 +77,19 @@ async function whichEdgeDbCli() {
       `  - CLI found in PATH at: ${location} (resolved to: ${actualLocation})`
     );
 
-    const scriptLocation = new URL(import.meta.url).pathname;
-    if (actualLocation === scriptLocation) {
+    if (actualLocation === SCRIPT_LOCATION) {
       debug("  - CLI found in PATH is the current script. Ignoring.");
       continue;
     }
+
+    const lowerCaseLocation = actualLocation.toLowerCase();
+    if (
+      lowerCaseLocation.endsWith(".cmd") ||
+      lowerCaseLocation.endsWith(".ps1")
+    ) {
+      debug("  - CLI found in PATH is a Windows script. Ignoring.");
+      continue;
+    }
     return location;
   }
   debug("  - No CLI found in PATH.");