From fb196f376b0b7adbf15f9cd65e2bc7a0a46e2709 Mon Sep 17 00:00:00 2001
From: Sebastian Malton <sebastian@malton.name>
Date: Fri, 4 Nov 2022 09:12:59 -0400
Subject: [PATCH] Fix handling of '' in env

Signed-off-by: Sebastian Malton <sebastian@malton.name>
---
 .../shell-env/compute-unix-shell-environment.injectable.ts  | 2 +-
 .../utils/shell-env/compute-unix-shell-environment.test.ts  | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts b/src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts
index 11aff51626..db09a0809e 100644
--- a/src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts
+++ b/src/main/utils/shell-env/compute-unix-shell-environment.injectable.ts
@@ -32,7 +32,7 @@ const getResetProcessEnv = (src: Partial<Record<string, string>>, overrides: Par
     },
     resetEnvPairs: (target) => {
       for (const [name, orginalValue] of originals) {
-        if (orginalValue) {
+        if (typeof orginalValue === "string") {
           target[name] = orginalValue;
         } else {
           delete target[name];
diff --git a/src/main/utils/shell-env/compute-unix-shell-environment.test.ts b/src/main/utils/shell-env/compute-unix-shell-environment.test.ts
index 39211c448e..2de7204ae8 100644
--- a/src/main/utils/shell-env/compute-unix-shell-environment.test.ts
+++ b/src/main/utils/shell-env/compute-unix-shell-environment.test.ts
@@ -22,6 +22,7 @@ const expectedEnv = {
   ELECTRON_RUN_AS_NODE: "1",
   ELECTRON_NO_ATTACH_CONSOLE: "1",
   TERM: "screen-256color-bce",
+  SOME_THIRD_NON_UNDEFINED_VALUE: "",
 };
 
 describe("computeUnixShellEnvironment technical tests", () => {
@@ -78,6 +79,7 @@ describe("computeUnixShellEnvironment technical tests", () => {
     di.override(processEnvInjectable, () => ({
       SOME_ENV_VAR: "some-env-value",
       TERM: "some-other-value",
+      SOME_THIRD_NON_UNDEFINED_VALUE: "",
     }));
     di.override(processExecPathInjectable, () => "/some/process/exec/path");
 
@@ -178,6 +180,7 @@ describe("computeUnixShellEnvironment technical tests", () => {
               PATH: "/bin",
               SOME_ENV_VAR: "some-env-value",
               TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
             },
           });
         });
@@ -279,6 +282,7 @@ describe("computeUnixShellEnvironment technical tests", () => {
               PATH: "/bin",
               SOME_ENV_VAR: "some-env-value",
               TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
             },
           });
         });
@@ -379,6 +383,7 @@ describe("computeUnixShellEnvironment technical tests", () => {
               PATH: "/bin",
               SOME_ENV_VAR: "some-env-value",
               TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
             },
           });
         });
@@ -478,6 +483,7 @@ describe("computeUnixShellEnvironment technical tests", () => {
               PATH: "/bin",
               SOME_ENV_VAR: "some-env-value",
               TERM: "some-other-value",
+              SOME_THIRD_NON_UNDEFINED_VALUE: "",
             },
           });
         });