From 3ad15a68e2139a8fdf220cd00843b3704df8d6cb Mon Sep 17 00:00:00 2001 From: redanthrax Date: Fri, 24 Jun 2022 11:24:00 -0700 Subject: [PATCH] fix build after merge --- agent/agent_unix.go | 6 +++--- agent/tactical/api/api.go | 1 - agent/utils/utils.go | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/agent/agent_unix.go b/agent/agent_unix.go index ddd5bac..12d96a8 100644 --- a/agent/agent_unix.go +++ b/agent/agent_unix.go @@ -281,14 +281,14 @@ func (a *Agent) NixMeshNodeID() string { meshSuccess := false a.Logger.Debugln("Getting mesh node id") - if !trmm.FileExists(a.MeshSystemEXE) { - a.Logger.Debugln(a.MeshSystemEXE, "does not exist. Skipping.") + if !trmm.FileExists(a.MeshSystemBin) { + a.Logger.Debugln(a.MeshSystemBin, "does not exist. Skipping.") return "" } opts := a.NewCMDOpts() opts.IsExecutable = true - opts.Shell = a.MeshSystemEXE + opts.Shell = a.MeshSystemBin opts.Command = "-nodeid" for !meshSuccess { diff --git a/agent/tactical/api/api.go b/agent/tactical/api/api.go index ae27797..3f40368 100644 --- a/agent/tactical/api/api.go +++ b/agent/tactical/api/api.go @@ -5,7 +5,6 @@ import ( "time" "github.com/amidaware/rmmagent/agent/tactical/config" - "github.com/amidaware/rmmagent/shared" "github.com/go-resty/resty/v2" ) diff --git a/agent/utils/utils.go b/agent/utils/utils.go index 037560f..c863ab0 100644 --- a/agent/utils/utils.go +++ b/agent/utils/utils.go @@ -13,7 +13,6 @@ import ( "time" "unicode/utf16" - "github.com/amidaware/rmmagent/shared" "github.com/go-resty/resty/v2" )