From 13beecb0ea04b81c5065261b33371c82c4cab987 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 18 Jan 2024 17:39:38 -0600
Subject: [PATCH] autobuild test 11?

Signed-off-by: Jeff Carr <jcarr@wit.com>
---
 globalBuildOptions.go |  6 ++++--
 unix.go               | 17 ++++++++---------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/globalBuildOptions.go b/globalBuildOptions.go
index 28fd69b..abbec4c 100644
--- a/globalBuildOptions.go
+++ b/globalBuildOptions.go
@@ -99,6 +99,7 @@ func globalBuildOptions(box *gui.Node) {
 	})
 
 	groupvbox.NewButton("rebuild autotypist", func() {
+		os.Setenv("GO111MODULE", "off")
 		quickCmdDoNotRun = true
 		quickCmdLastPath = "~/go/src"
 		quickCmds = [][]string{}
@@ -107,13 +108,14 @@ func globalBuildOptions(box *gui.Node) {
 		quickCmd(fullpath, []string{"mkdir", "-p", "go.wit.com/apps/"})
 
 		fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist"
-		quickCmd(fullpath, []string{"go", "get", "-v", "-u", "go.wit.com/apps/autotypist"})
-		quickCmd(fullpath, []string{"go", "get", "-v", "-u", "go.wit.com/toolkits/debian"})
+		quickCmd(fullpath, []string{"go", "get", "-v", "go.wit.com/apps/autotypist"})
+		quickCmd(fullpath, []string{"go", "get", "-v", "go.wit.com/toolkits/debian"})
 
 		fullpath = "/home/jcarr/go/src/go.wit.com/toolkits/debian"
 		quickCmd(fullpath, []string{"make"})
 
 		fullpath = "/home/jcarr/go/src/go.wit.com/apps/autotypist"
+		quickCmd(fullpath, []string{"go", "get", "-v", "-u", "."})
 		quickCmd(fullpath, []string{"go", "-v", "-x", "build"})
 		me.script = quickCmds
 		setGitCommands()
diff --git a/unix.go b/unix.go
index d03964a..e7e382b 100644
--- a/unix.go
+++ b/unix.go
@@ -12,7 +12,7 @@ var repopath string = "/home/jcarr/"
 // if dryRun == true, then it just prints out the values
 // but doesn't do anything
 func goMake(dryRun string) bool {
-	var workingPath string = "go/src"
+	var workingpath string = "~/go/src"
 	for _, line := range me.script {
 		if len(line) == 0 {
 			continue
@@ -20,11 +20,11 @@ func goMake(dryRun string) bool {
 		if line[0] == "cd" {
 			switch len(line) {
 			case 1:
-				log.Verbose("do cmdPwd() to go root", repopath+"go/src")
-				workingPath = ""
+				log.Verbose("do cmdPwd() TODO: change working path to ~ ?")
+				workingpath = "/home/jcarr/go/src/go.wit.com/"
 			case 2:
 				log.Verbose("do cmdPwd() here", line)
-				workingPath = line[1]
+				workingpath = line[1]
 			default:
 				log.Warn("bad cd", line)
 				return false
@@ -33,19 +33,18 @@ func goMake(dryRun string) bool {
 		}
 		cmd := line[0]
 		s := strings.Join(line[1:], " ")
-		path := repopath + workingPath
-		log.Warn("NEED TO RUN path =", path, "cmd =", cmd, s)
+		log.Warn("NEED TO RUN path =", workingpath, "cmd =", cmd, s)
 		if dryRun == "--dry-run" {
 			continue
 		}
 		if dryRun == "--doit" {
-			log.Warn("Actually RUN path =", path, "cmd =", cmd, s)
-			err, b, output := repostatus.RunCmd(path, line)
+			log.Warn("Actually RUN path =", workingpath, "cmd =", cmd, s)
+			err, b, output := repostatus.RunCmd(workingpath, line)
 			if err != nil {
+				log.Info("output =", output)
 				log.Info("ABEND EXECUTION")
 				log.Info("error =", err)
 				log.Info("b =", b)
-				log.Info("output =", output)
 				return false
 			}
 			// log.Warn("output was =", output)