fix shell errors, rename test_detect_os.rb -> upg_test.rb

core/core.go

@@ -221,17 +221,17 @@ func init() {
 	RootCmd.AddCommand(verxCmd)
 }
 
-const clone string = "git clone https://github.com/secman-team/"
-const winCmd string = clone + "sm-win ~/sm"
-const cmd string = clone + "sm /home/sm"
-
 func loading(text string) {
 	s := spinner.New(spinner.CharSets[35], 100*time.Millisecond)
 	s.Suffix = " " + text
 	s.Start()
 	s.Stop()
 }
 
+const clone string = "git clone https://github.com/secman-team/"
+const winCmd string = clone + "sm-win ~/sm"
+const cmd string = clone + "sm /home/sm"
+
 // main
 func main() {
 	if runtime.GOOS == "windows" {
@@ -241,7 +241,7 @@ func main() {
 			} else {
 				loading("installing windows deps...")
 
-				SHCore(cmd, winCmd)
+				shell.SHCore(cmd, winCmd)
 
 				RootCmd.Execute()
 			}
@@ -253,7 +253,7 @@ func main() {
 			} else {
 				loading("installing linux/macos deps...")
 
-				SHCore(cmd, winCmd)
+				shell.SHCore(cmd, winCmd)
 
 				RootCmd.Execute()
 			}

fetch/fetch.go

@@ -1,8 +1,6 @@
 package fetch
 
 import (
-	"fmt"
-	"os/exec"
 	"time"
 
 	"github.com/briandowns/spinner"
@@ -14,7 +12,7 @@ func FetchSECDIR() {
 	s.Suffix = " Fetching..."
 	s.Start()
 
-	SHCore("secman-sync pl", "bash ssc pl")
+	shell.SHCore("secman-sync pl", "bash ssc pl")
 
 	s.Stop()
 }

go.sum

@@ -148,6 +148,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
+github.com/secman-team/shell v0.1.0 h1:cTqRgG7Oqhst/s/z/CERg/+ZgSOxE/qK9ctM/B9wHdQ=
 github.com/secman-team/shell v0.1.0/go.mod h1:+kAfttTSmyjzVbKIksunNkDxJONomZp52cwY/PgCHHs=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=

upgrade/upg.go

@@ -1,18 +1,7 @@
 package upg
 
-import (
-	"fmt"
-	"os/exec"
-)
+import "github.com/secman-team/shell"
 
 func Upgrade() {
-	cmd := exec.Command("verx", "--upg")
-	stdout, err := cmd.Output()
-
-	if err != nil {
-		fmt.Println(err.Error())
-		return
-	}
-
-	fmt.Print(string(stdout))
+	shell.SHCore("verx --upg", "bash vx --upg")
 }