fix: js/py dotenv unexpectedly overrides existing env vars (#113)

sigoden · Oct 18, 2024 · 615aa25 · 615aa25
1 parent fb62dd5
commit 615aa25
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/Argcfile.sh b/Argcfile.sh
@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set -e
 
-# @meta dotenv
-
 BIN_DIR=bin
 TMP_DIR="cache/tmp"
 

diff --git a/scripts/run-agent.js b/scripts/run-agent.js
@@ -75,7 +75,10 @@ async function loadEnv(filePath) {
       if (line.trim().startsWith("#") || line.trim() === "") return;
 
       const [key, ...value] = line.split("=");
-      process.env[key.trim()] = value.join("=").trim();
+      const envName = key.trim();
+      if (!process.env[envName]) {
+        process.env[envName] = value.join("=").trim();
+      }
     });
   } catch { }
 }

diff --git a/scripts/run-agent.py b/scripts/run-agent.py
@@ -67,7 +67,9 @@ def load_env(file_path):
                     continue
 
                 key, *value = line.split("=")
-                os.environ[key.strip()] = "=".join(value).strip()
+                env_name = key.strip()
+                if env_name not in os.environ:
+                    os.environ[env_name] = "=".join(value).strip()
     except FileNotFoundError:
         pass
 

diff --git a/scripts/run-tool.js b/scripts/run-tool.js
@@ -62,7 +62,10 @@ async function loadEnv(filePath) {
       if (line.trim().startsWith("#") || line.trim() === "") return;
 
       const [key, ...value] = line.split("=");
-      process.env[key.trim()] = value.join("=").trim();
+      const envName = key.trim();
+      if (!process.env[envName]) {
+        process.env[envName] = value.join("=").trim();
+      }
     });
   } catch { }
 }

diff --git a/scripts/run-tool.py b/scripts/run-tool.py
@@ -62,7 +62,9 @@ def load_env(file_path):
                     continue
 
                 key, *value = line.split("=")
-                os.environ[key.strip()] = "=".join(value).strip()
+                env_name = key.strip()
+                if env_name not in os.environ:
+                    os.environ[env_name] = "=".join(value).strip()
     except FileNotFoundError:
         pass