Fix completely overriding PATH in shellSync (#5451)

src/main/shell-sync.ts

@@ -8,6 +8,7 @@ import os from "os";
 import { app } from "electron";
 import logger from "./logger";
 import { isSnap } from "../common/vars";
+import { unionPATHs } from "../common/utils/union-env-path";
 
 /**
  * shellSync loads what would have been the environment if this application was
@@ -25,7 +26,8 @@ export async function shellSync() {
   }
 
   if (!isSnap) {
-    process.env.PATH = env.PATH;
+    // Prefer the synced PATH over the initial one
+    process.env.PATH = unionPATHs(env.PATH ?? "",  process.env.PATH ?? "");
   }
 
   // The spread operator allows joining of objects. The precedence is last to first.

src/main/utils/shell-env.ts

@@ -6,7 +6,7 @@
 import shellEnvironment from "shell-env";
 import logger from "../logger";
 
-export type EnvironmentVariables = Record<string, string>;
+export type EnvironmentVariables = Partial<Record<string, string>>;
 
 let shellSyncFailed = false;