cabele/rmmagent
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix build after merge

Browse source
This commit is contained in:
redanthrax 2022-06-24 11:24:00 -07:00
parent 0d2e1a76a2
commit 3ad15a68e2
3 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
agent/agent_unix.go
View file

@ -281,14 +281,14 @@ func (a *Agent) NixMeshNodeID() string {
meshSuccess := false meshSuccess := false
a.Logger.Debugln("Getting mesh node id") a.Logger.Debugln("Getting mesh node id")
if !trmm.FileExists(a.MeshSystemEXE) { if !trmm.FileExists(a.MeshSystemBin) {
a.Logger.Debugln(a.MeshSystemEXE, "does not exist. Skipping.") a.Logger.Debugln(a.MeshSystemBin, "does not exist. Skipping.")
return "" return ""
} }
opts := a.NewCMDOpts() opts := a.NewCMDOpts()
opts.IsExecutable = true opts.IsExecutable = true
opts.Shell = a.MeshSystemEXE opts.Shell = a.MeshSystemBin
opts.Command = "-nodeid" opts.Command = "-nodeid"
for !meshSuccess { for !meshSuccess {

1
agent/tactical/api/api.go
View file

@ -5,7 +5,6 @@ import (
"time" "time"
"github.com/amidaware/rmmagent/agent/tactical/config" "github.com/amidaware/rmmagent/agent/tactical/config"
"github.com/amidaware/rmmagent/shared"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
) )

1
agent/utils/utils.go
View file

@ -13,7 +13,6 @@ import (
"time" "time"
"unicode/utf16" "unicode/utf16"
"github.com/amidaware/rmmagent/shared"
"github.com/go-resty/resty/v2" "github.com/go-resty/resty/v2"
) )