From c708bad1ad509a00bc7a61e8d6a002ba1fdbf2d9 Mon Sep 17 00:00:00 2001
From: Mashintime <awh@brainless.us>
Date: Thu, 16 Feb 2023 18:13:26 -0500
Subject: [PATCH] Hamlib: use long options. no autoquote on windows.

---
 gui/main.js         |  4 +++-
 gui/preload-main.js | 10 +++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/gui/main.js b/gui/main.js
index bf1a946a..a3a98b65 100644
--- a/gui/main.js
+++ b/gui/main.js
@@ -794,7 +794,9 @@ function close_all() {
 // RUN RIGCTLD
 ipcMain.on("request-start-rigctld", (event, data) => {
   try {
-    let rigctld_proc = spawn(data.path, data.parameters);
+    let rigctld_proc = spawn(data.path, data.parameters, {
+      windowsVerbatimArguments: true,
+    });
 
     rigctld_proc.on("exit", function (code) {
       console.log("rigctld process exited with code " + code);
diff --git a/gui/preload-main.js b/gui/preload-main.js
index 8f5a34a9..8ccdf731 100644
--- a/gui/preload-main.js
+++ b/gui/preload-main.js
@@ -610,20 +610,20 @@ window.addEventListener("DOMContentLoaded", () => {
     var paramList = [];
 
     var hamlib_deviceid = document.getElementById("hamlib_deviceid").value;
-    paramList = paramList.concat("-m", hamlib_deviceid);
+    paramList = paramList.concat("--model="+ hamlib_deviceid);
 
     // hamlib deviceport setting
     if (document.getElementById("hamlib_deviceport").value !== "ignore") {
       var hamlib_deviceport =
         document.getElementById("hamlib_deviceport").value;
-      paramList = paramList.concat("-r", hamlib_deviceport);
+      paramList = paramList.concat("--rig-file="+ hamlib_deviceport);
     }
 
     // hamlib serialspeed setting
     if (document.getElementById("hamlib_serialspeed").value !== "ignore") {
       var hamlib_serialspeed =
         document.getElementById("hamlib_serialspeed").value;
-      paramList = paramList.concat("-s", hamlib_serialspeed);
+      paramList = paramList.concat("--serial-speed="+ hamlib_serialspeed);
     }
 
     // hamlib databits setting
@@ -655,7 +655,7 @@ window.addEventListener("DOMContentLoaded", () => {
     // hamlib ptt port
     if (document.getElementById("hamlib_ptt_port").value !== "ignore") {
       var hamlib_ptt_port = document.getElementById("hamlib_ptt_port").value;
-      paramList = paramList.concat("-p", hamlib_ptt_port);
+      paramList = paramList.concat("--ptt-file="+ hamlib_ptt_port);
     }
 
     // hamlib ptt type
@@ -673,7 +673,7 @@ window.addEventListener("DOMContentLoaded", () => {
     var hamlib_rigctld_server_port = document.getElementById(
       "hamlib_rigctld_server_port"
     ).value;
-    paramList = paramList.concat("-t", hamlib_rigctld_server_port);
+    paramList = paramList.concat("--port=" + hamlib_rigctld_server_port);
 
     //Custom rigctld arguments to pass to rigctld
     var hamlib_rigctld_custom_args = document.getElementById(