From 0d2e1a76a235746bff1532d1be41c2128c1991f2 Mon Sep 17 00:00:00 2001
From: redanthrax <redanthraxx@gmail.com>
Date: Fri, 24 Jun 2022 11:23:07 -0700
Subject: [PATCH] testing/merge fixes

---
 agent/install.go          |  2 +-
 agent/tactical/api/api.go |  1 -
 agent/testargs.json       | 19 +++++++++++++++++++
 agent/utils/utils.go      |  4 ----
 4 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 agent/testargs.json

diff --git a/agent/install.go b/agent/install.go
index db8fad3..7086514 100644
--- a/agent/install.go
+++ b/agent/install.go
@@ -142,7 +142,7 @@ func (a *Agent) Install(i *Installer) {
 	if len(i.MeshDir) > 0 {
 		installerMeshSystemEXE = filepath.Join(i.MeshDir, "MeshAgent.exe")
 	} else {
-		installerMeshSystemEXE = a.MeshSystemEXE
+		installerMeshSystemEXE = a.MeshSystemBin
 	}
 
 	var meshNodeID string
diff --git a/agent/tactical/api/api.go b/agent/tactical/api/api.go
index f2e914b..ae27797 100644
--- a/agent/tactical/api/api.go
+++ b/agent/tactical/api/api.go
@@ -24,7 +24,6 @@ func init() {
 	restyC.SetCloseConnection(true)
 	restyC.SetHeaders(headers)
 	restyC.SetTimeout(15 * time.Second)
-	restyC.SetDebug(shared.DEBUG)
 
 	if len(ac.Proxy) > 0 {
 		restyC.SetProxy(ac.Proxy)
diff --git a/agent/testargs.json b/agent/testargs.json
new file mode 100644
index 0000000..f67df19
--- /dev/null
+++ b/agent/testargs.json
@@ -0,0 +1,19 @@
+{
+    "api": "http://api.hothcorp.com:8000",
+    "clientid": 1,
+    "siteid": 1,
+    "description": "",
+    "agenttype": "workstation",
+    "power": false,
+    "rdp": false,
+    "ping": false,
+    "token": "e27883a248ab900724daf6ed578b38215f08b0f3edb224a7eaef7cbd0062fd3f",
+    "localmesh": "",
+    "cert": "",
+    "proxy": "",
+    "timeout": 30,
+    "silent": true,
+    "nomesh": true,
+    "meshdir": "",
+    "meshnodeid": ""
+}
\ No newline at end of file
diff --git a/agent/utils/utils.go b/agent/utils/utils.go
index 68e7f4e..037560f 100644
--- a/agent/utils/utils.go
+++ b/agent/utils/utils.go
@@ -77,10 +77,6 @@ func WebRequest(requestType string, timeout time.Duration, payload map[string]st
 	client := resty.New()
 	client.SetTimeout(timeout * time.Second)
 	client.SetCloseConnection(true)
-	if shared.DEBUG {
-		client.SetDebug(true)
-	}
-
 	result, err := client.R().Get(url)
 	return *result, err
 }