util: move SplitNL() from cmd package to strs

Signed-off-by: Enrico Weigelt, metux IT consult <[email protected]>
metux · Dec 10, 2023 · a57921d · a57921d
1 parent 369e21d
commit a57921d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/util/cmd/run.go b/util/cmd/run.go
@@ -6,6 +6,8 @@ import (
 	"os"
 	"os/exec"
 	"strings"
+
+	"github.com/metux/go-metabuild/util/strs"
 )
 
 func RunOut(cmdline []string, logErr bool) (string, error) {
@@ -42,22 +44,14 @@ func RunGroup(cmdlines [][]string) ([]string, []error) {
 	return outs, errs
 }
 
-func splitNL(s string) []string {
-	s = strings.TrimSpace(s)
-	if s == "" {
-		return []string{}
-	}
-	return strings.Split(s, "\n")
-}
-
 func RunOutOne(cmdline []string, logErr bool) (string, error) {
 	out, err := RunOut(cmdline, logErr)
 	return strings.TrimSpace(out), err
 }
 
 func RunOutLines(cmdline []string, logErr bool) ([]string, error) {
 	out, err := RunOutOne(cmdline, logErr)
-	return splitNL(out), err
+	return strs.SplitNL(out), err
 }
 
 func RunOutCmd(cmdline []string, logErr bool) ([]string, error) {

diff --git a/util/strs/splitnl.go b/util/strs/splitnl.go
@@ -0,0 +1,13 @@
+package strs
+
+import (
+	"strings"
+)
+
+func SplitNL(s string) []string {
+	s = strings.TrimSpace(s)
+	if s == "" {
+		return []string{}
+	}
+	return strings.Split(s, "\n")
+}