From a804e16f3d28d011d410ca017eacbc7a97b6187f Mon Sep 17 00:00:00 2001
From: liamcottle <liam@liamcottle.com>
Date: Tue, 9 Jul 2024 20:50:39 +1200
Subject: [PATCH] support providing meshchat command line args to portable
 electron exe

---
 electron/main.js | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/electron/main.js b/electron/main.js
index c86e438..7dbd764 100644
--- a/electron/main.js
+++ b/electron/main.js
@@ -101,11 +101,24 @@ app.whenReady().then(async () => {
             fs.renameSync(oldStorageDir, storageDir);
         }
 
-        // spawn executable
-        exeChildProcess = await spawn(exe, [
+        // get arguments passed to application, and remove the provided application path
+        const userProvidedArguments = process.argv.slice(1);
+
+        // arguments we always want to pass in
+        const requiredArguments = [
             '--headless', // reticulum meshchat usually launches default web browser, we don't want this when using electron
             '--port', '9337', // FIXME: let system pick a random unused port?
-            '--storage-dir', storageDir,
+        ];
+
+        // if user didn't provide storage dir, we should provide it
+        if(!userProvidedArguments.includes("--storage-dir")){
+            requiredArguments.push("--storage-dir", storageDir);
+        }
+
+        // spawn executable
+        exeChildProcess = await spawn(exe, [
+            ...requiredArguments, // always provide required arguments
+            ...userProvidedArguments, // also include any user provided arguments
         ]);
 
         // log stdout