Browse Source

adding distro-specific utils

afeiszli 3 years ago
parent
commit
cf5739796a

+ 0 - 13
netclient/ncutils/netclientutils.go

@@ -399,19 +399,6 @@ func Copy(src, dst string) error {
 	return err
 	return err
 }
 }
 
 
-// RunCmd - runs a local command
-func RunCmd(command string, printerr bool) (string, error) {
-	args := strings.Fields(command)
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Wait()
-	out, err := cmd.CombinedOutput()
-	if err != nil && printerr {
-		log.Println("error running command:", command)
-		log.Println(strings.TrimSuffix(string(out), "\n"))
-	}
-	return string(out), err
-}
-
 // RunsCmds - runs cmds
 // RunsCmds - runs cmds
 func RunCmds(commands []string, printerr bool) error {
 func RunCmds(commands []string, printerr bool) error {
 	var err error
 	var err error

+ 22 - 0
netclient/ncutils/netclientutils_darwin.go

@@ -0,0 +1,22 @@
+package ncutils
+
+import (
+	"log"
+	"os/exec"
+	"strings"
+)
+
+// RunCmd - runs a local command
+func RunCmd(command string, printerr bool) (string, error) {
+	args := strings.Fields(command)
+	cmd := exec.Command(args[0], args[1:]...)
+	cmd.Wait()
+	out, err := cmd.CombinedOutput()
+	if err != nil && printerr {
+		log.Println("error running command:", command)
+		log.Println(strings.TrimSuffix(string(out), "\n"))
+	}
+	return string(out), err
+}
+turn string(out), err
+}

+ 0 - 17
netclient/ncutils/netclientutils_freebsd.go

@@ -2,28 +2,11 @@ package ncutils
 
 
 import (
 import (
 	"context"
 	"context"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
 	"log"
 	"log"
-	"math/rand"
-	"net"
-	"net/http"
-	"os"
 	"os/exec"
 	"os/exec"
-	"regexp"
-	"runtime"
-	"strconv"
 	"strings"
 	"strings"
 	"syscall"
 	"syscall"
 	"time"
 	"time"
-
-	"golang.zx2c4.com/wireguard/wgctrl"
-	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/credentials"
 )
 )
 
 
 // Runs Commands for FreeBSD
 // Runs Commands for FreeBSD

+ 20 - 0
netclient/ncutils/netclientutils_linux.go

@@ -0,0 +1,20 @@
+package ncutils
+
+import (
+	"log"
+	"os/exec"
+	"strings"
+)
+
+// RunCmd - runs a local command
+func RunCmd(command string, printerr bool) (string, error) {
+	args := strings.Fields(command)
+	cmd := exec.Command(args[0], args[1:]...)
+	cmd.Wait()
+	out, err := cmd.CombinedOutput()
+	if err != nil && printerr {
+		log.Println("error running command:", command)
+		log.Println(strings.TrimSuffix(string(out), "\n"))
+	}
+	return string(out), err
+}

+ 40 - 0
netclient/ncutils/netclientutils_windows.go

@@ -0,0 +1,40 @@
+package ncutils
+
+import (
+	"context"
+	"crypto/tls"
+	"errors"
+	"fmt"
+	"io"
+	"io/ioutil"
+	"log"
+	"math/rand"
+	"net"
+	"net/http"
+	"os"
+	"os/exec"
+	"regexp"
+	"runtime"
+	"strconv"
+	"strings"
+	"syscall"
+	"time"
+
+	"golang.zx2c4.com/wireguard/wgctrl"
+	"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
+	"google.golang.org/grpc"
+	"google.golang.org/grpc/credentials"
+)
+
+// RunCmd - runs a local command
+func RunCmd(command string, printerr bool) (string, error) {
+	args := strings.Fields(command)
+	cmd := exec.Command(args[0], args[1:]...)
+	cmd.Wait()
+	out, err := cmd.CombinedOutput()
+	if err != nil && printerr {
+		log.Println("error running command:", command)
+		log.Println(strings.TrimSuffix(string(out), "\n"))
+	}
+	return string(out), err
+}