update for other architectures

netclient/ncutils/netclientutils_darwin.go

@@ -1,7 +1,7 @@
 package ncutils
 
 import (
-	"log"
+	"github.com/gravitl/netmaker/logger"
 	"os/exec"
 	"strings"
 )
@@ -13,8 +13,8 @@ func RunCmd(command string, printerr bool) (string, error) {
 	cmd.Wait()
 	out, err := cmd.CombinedOutput()
 	if err != nil && printerr {
-		log.Println("error running command:", command)
-		log.Println(strings.TrimSuffix(string(out), "\n"))
+		logger.Log(0, "error running command:", command)
+		logger.Log(0, strings.TrimSuffix(string(out), "\n"))
 	}
 	return string(out), err
 }

netclient/ncutils/netclientutils_freebsd.go

@@ -2,12 +2,12 @@ package ncutils
 
 import (
 	"context"
-	"fmt"
-	"log"
 	"os/exec"
 	"strings"
 	"syscall"
 	"time"
+
+	"github.com/gravitl/netmaker/logger"
 )
 
 // RunCmdFormatted - run a command formatted for freebsd
@@ -19,8 +19,8 @@ func RunCmdFormatted(command string, printerr bool) (string, error) {
 	cmd.Wait()
 	out, err := cmd.CombinedOutput()
 	if err != nil && printerr {
-		Log(fmt.Sprintf("error running command: %s", command))
-		Log(strings.TrimSuffix(string(out), "\n"))
+		logger.Log(0, "error running command: ", command)
+		logger.Log(0, strings.TrimSuffix(string(out), "\n"))
 	}
 	return string(out), err
 }
@@ -43,8 +43,8 @@ func RunCmd(command string, printerr bool) (string, error) {
 	}()
 	out, err := cmd.CombinedOutput()
 	if err != nil && printerr {
-		log.Println("error running command:", command)
-		log.Println(strings.TrimSuffix(string(out), "\n"))
+		logger.Log(0, "error running command:", command)
+		logger.Log(0, strings.TrimSuffix(string(out), "\n"))
 	}
 	return string(out), err
 }

netclient/ncutils/netclientutils_windows.go

@@ -21,8 +21,8 @@ func RunCmd(command string, printerr bool) (string, error) {
 	//cmd.SysProcAttr = &syscall.SysProcAttr{CmdLine: "/C \"" + command + "\""}
 	out, err := cmd.CombinedOutput()
 	if err != nil && printerr {
-		log.Println("error running command:", command)
-		log.Println(strings.TrimSuffix(string(out), "\n"))
+		logger.Log(0, "error running command:", command)
+		logger.Log(0, strings.TrimSuffix(string(out), "\n"))
 	}
 	return string(out), err
 }
@@ -38,8 +38,8 @@ func RunCmdFormatted(command string, printerr bool) (string, error) {
 	cmd.Wait()
 	out, err := cmd.CombinedOutput()
 	if err != nil && printerr {
-		log.Println("error running command:", command)
-		log.Println(strings.TrimSuffix(string(out), "\n"))
+		logger.Log(0, "error running command:", command)
+		logger.Log(0, strings.TrimSuffix(string(out), "\n"))
 	}
 	return string(out), err
 }
@@ -53,7 +53,7 @@ func GetEmbedded() error {
 	fileName := fmt.Sprintf("%swinsw.exe", GetNetclientPathSpecific())
 	err = os.WriteFile(fileName, data, 0700)
 	if err != nil {
-		Log("could not mount winsw.exe")
+		logger.Log(0, "could not mount winsw.exe")
 		return err
 	}
 	return nil