gravitl/netmaker
1
1
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-08 12:56:16 +08:00
Code Issues Projects Releases Packages Wiki Activity

update for other architectures

Browse source
This commit is contained in:
Matthew R. Kasun 2022-03-21 07:30:56 -04:00 • committed by 0xdcarns
parent 11b1098390
commit fa78fe208f
3 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
netclient/ncutils/netclientutils_darwin.go
View file

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

12
netclient/ncutils/netclientutils_freebsd.go
View file

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

10
netclient/ncutils/netclientutils_windows.go
View file

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