strangely time.Sleep() doesn't seem to work

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 21 insertions, 52 deletions

diff --git a/globalBuildOptions.go b/globalBuildOptions.go
index db6e676..1e64b28 100644
--- a/globalBuildOptions.go
+++ b/globalBuildOptions.go
@@ -9,7 +9,6 @@ import (
 
 	"go.wit.com/gui"
 	"go.wit.com/lib/gadgets"
-	"go.wit.com/lib/gui/repostatus"
 )
 
 func doesExist(path string) bool {
@@ -27,13 +26,15 @@ func quickCmd(fullpath string, cmd []string) bool {
 	var b bool
 	var output string
 
+	log.Warn("RUN:", fullpath, cmd)
 	cmd = []string{"mkdir", "-p", "go.wit.com/apps/"}
 	if err != nil {
-		err, b, output = repostatus.RunCmd(fullpath, cmd)
-		log.Error(err, b, string(output))
+		err, b, output = RunCmdNew(fullpath, cmd)
+		log.Error(err)
 		return false
 	} else if ! b {
-		log.Error(err, b, string(output))
+		log.Warn("b =", b)
+		log.Warn("output =", string(output))
 		return true
 	}
 	log.Warn("output = ", string(output))
@@ -78,68 +79,36 @@ func globalBuildOptions(box *gui.Node) {
 		quickCmd(fullpath, []string{"mkdir", "-p", "go.wit.com/apps/"})
 
 		fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist"
-		cmd := []string{"go", "get", "-v", "-u", "go.wit.com/apps/autotypist"}
-		err, b, output := repostatus.RunCmd(fullpath, cmd)
-		log.Warn(err, b, string(output))
-
-		cmd = []string{"go", "get", "-v", "-u", "go.wit.com/toolkits/debian"}
-		err, b, output = repostatus.RunCmd(fullpath, cmd)
-		log.Warn(err, b, string(output))
+		quickCmd(fullpath, []string{"go", "get", "-v", "-u", "go.wit.com/apps/autotypist"})
+		quickCmd(fullpath, []string{"go", "get", "-v", "-u", "go.wit.com/toolkits/debian"})
 
 		fullpath = "/home/jcarr/go/src/go.wit.com/toolkits/debian"
+		quickCmd(fullpath, []string{"make"})
 
-		cmd = []string{"make"}
-		err, b, output = repostatus.RunCmd(fullpath, cmd)
-		log.Warn(err, b, string(output))
+		fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist"
+		quickCmd(fullpath, []string{"go", "-v", "-x", "build"})
 	})
 
 	me.rerunGoMod = groupvbox.NewButton("re-run go mod & go tidy", func() {
 		me.rerunGoMod.Disable()
 		log.Warn("scanning allrepos")
 		os.Unsetenv("GO111MODULE")
-		for repo, path := range me.allrepos {
-			var cmd []string
-			var err error
-			var b bool
-			var output string
-
-			log.Warn("found repo", path, repo.String())
+		for _, path := range me.allrepos {
 			fullpath := "/home/jcarr/go/src/" + path
-
+			// set the button text for the user
 			me.rerunGoMod.SetText("Running go.mod " + fullpath)
 
-			cmd = []string{"rm", "go.mod", "go.sum"}
-			// log.Warn("Actually RUN path =", fullpath, "cmd =", cmd)
-			err, b, output = repostatus.RunCmd(fullpath, cmd)
-			log.Warn(err, b, string(output))
-
-			log.Sleep(.1)
-
-			cmd = []string{"go", "mod", "init"}
-			// log.Warn("Actually RUN path =", fullpath, "cmd =", cmd)
-			err, b, output = repostatus.RunCmd(fullpath, cmd)
-			log.Warn(err, b, string(output))
-			if err != nil {
-				return
-			}
-
-			log.Sleep(.1)
-
-			cmd = []string{"go", "mod", "tidy"}
-			// log.Warn("Actually RUN path =", fullpath, "cmd =", cmd)
-			err, b, output = repostatus.RunCmd(fullpath, cmd)
-			log.Warn(err, b, string(output))
-			if err != nil {
-				return
-			}
-
-			log.Sleep(.2)
+			quickCmd(fullpath, []string{"pwd"})
+			quickCmd(fullpath, []string{"ls", "-l"})
+			quickCmd(fullpath, []string{"go", "status"}) // TODO: process this?
+			quickCmd(fullpath, []string{"rm", "go.mod", "go.sum"})
 
-			cmd = []string{"git", "status"}
-			// log.Warn("Actually RUN path =", fullpath, "cmd =", cmd)
-			err, b, output = repostatus.RunCmd(fullpath, cmd)
-			log.Warn(err, b, string(output))
+			quickCmd(fullpath, []string{"go", "mod", "init"})
+			log.Sleep(.1) // don't hammer google's golang versioning system
+			quickCmd(fullpath, []string{"go", "mod", "tidy"})
+			log.Sleep(.2) // don't hammer google's golang versioning system
 		}
+		// re-enable the button
 		me.rerunGoMod.SetText("re-run go mod & go tidy")
 		me.rerunGoMod.Enable()
 	})