closer to automatic 'go get' myself

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

1 files changed, 7 insertions, 5 deletions

diff --git a/main.go b/main.go
index 4c682f6..ec13bd7 100644
--- a/main.go
+++ b/main.go
@@ -178,8 +178,8 @@ func repoworld() {
 	buildOptions.NewLabel("get autotypist")
 	buildOptions.NewButton("go get", func () {
 		var newCmds [][]string
-		newCmds = append(newCmds, []string{"mkdir", "-p", "go/src/go.wit.com/apps"})
-		newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/myrepos"})
+		newCmds = append(newCmds, []string{"mkdir", "-p", "~/go/src/go.wit.com/apps"})
+		newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/"})
 		newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "go.wit.com/apps/myrepos"})
 		newCmds = append(newCmds, []string{"cd", "go/src/go.wit.com/apps/myrepos"})
 		newCmds = append(newCmds, []string{"go", "get", "-v", "-u", "."})
@@ -210,10 +210,11 @@ func repoworld() {
 
 	buildOptions.NewLabel("--dry-run")
 	dryrun = buildOptions.NewButton("show commands", func () {
-		if dryRunCommands() {
+		if goMake("--dry-run") {
 			log.Warn("EVERYTHING MIGHT HAVE WORKED")
 		} else {
-			log.Warn("EVERYTHING DID NOT WORK")
+			log.Warn("EVERYTHING WILL NOT WORK")
+			dryrun.Disable()
 		}
 	})
 
@@ -221,7 +222,8 @@ func repoworld() {
 	doit = buildOptions.NewButton("run commands", func () {
 		doit.Disable()
 		log.Warn("should run the commands here")
-		if runCommands() {
+		// true here means dryrun == true. it's confusingly named
+		if goMake("--doit") {
 			log.Warn("EVERYTHING WORKED")
 		} else {
 			log.Warn("EVERYTHING DID NOT WORK")