1 files changed, 55 insertions, 49 deletions
diff --git a/windowHowto.go b/windowHowto.go
index 31b07a0..bc27078 100644
--- a/windowHowto.go
+++ b/windowHowto.go
@@ -6,6 +6,8 @@ package main
 // An app to submit patches for the 30 GO GUI repos
 
 import (
+	"os"
+
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gui/shell"
 	"go.wit.com/log"
@@ -43,59 +45,63 @@ func makeHowtoWin() *genericWindow {
 	grid.NewButton("Download", func() {
 		howtoWin.Disable()
 		defer howtoWin.Enable()
-		log.Info("download here")
-		if path, err := fhelp.CheckCmd("go-clone"); err != nil {
-			log.Info("go-clone missing", path, err)
-			cmd := []string{"go", "install", "go.wit.com/apps/go-clone@latest"}
-			shell.RunRealtime(cmd)
-		}
-		if _, err := fhelp.CheckCmd("autogenpb"); err != nil {
-			cmd := []string{"go", "install", "go.wit.com/apps/autogenpb@latest"}
-			shell.RunRealtime(cmd)
-		}
-		if _, err := fhelp.CheckCmd("go-mod-clean"); err != nil {
-			cmd := []string{"go", "install", "go.wit.com/apps/go-mod-clean@latest"}
-			shell.RunRealtime(cmd)
-		}
-		if path, err := fhelp.CheckCmd("go-clone"); err != nil {
-			log.Info("can't prep build. you probably need ~/go/bin in your PATH", path, err)
-			return
-		}
-		var basecmd []string
-		var cmd []string
-		if me.forge.IsGoWork() {
-			log.Info("NOT GO WORK")
-			basecmd = []string{"go-clone", "--work", "--recursive"}
-		} else {
-			log.Info("IS GO WORK")
-			basecmd = []string{"go-clone", "--recursive"}
-		}
-		// log.Info("Running:", cmd)
-		// shell.RunRealtime(cmd)
+		buildForge()
+	})
+	return howtoWin
+}
 
-		cmd = append(basecmd, "go.wit.com/apps/go-mod-clean")
-		log.Info("Running:", cmd)
+func buildForge() {
+	log.Info("download here")
+	if path, err := fhelp.CheckCmd("go-clone"); err != nil {
+		log.Info("go-clone missing", path, err)
+		cmd := []string{"go", "install", "go.wit.com/apps/go-clone@latest"}
 		shell.RunRealtime(cmd)
-
-		cmd = append(basecmd, "go.wit.com/apps/forge")
-		log.Info("Running:", cmd)
+	}
+	if _, err := fhelp.CheckCmd("autogenpb"); err != nil {
+		cmd := []string{"go", "install", "go.wit.com/apps/autogenpb@latest"}
 		shell.RunRealtime(cmd)
-
-		cmd = append(basecmd, "go.wit.com/toolkits/gocui")
-		log.Info("Running:", cmd)
+	}
+	if _, err := fhelp.CheckCmd("go-mod-clean"); err != nil {
+		cmd := []string{"go", "install", "go.wit.com/apps/go-mod-clean@latest"}
 		shell.RunRealtime(cmd)
+	}
+	if path, err := fhelp.CheckCmd("go-clone"); err != nil {
+		log.Info("can't prep build. you probably need ~/go/bin in your PATH", path, err)
+		return
+	}
+	var basecmd []string
+	var cmd []string
+	if me.forge.IsGoWork() {
+		log.Info("Using go.work directory")
+		basecmd = []string{"go-clone", "--work", "--recursive"}
+	} else {
+		basecmd = []string{"go-clone", "--recursive"}
+	}
+	// log.Info("Running:", cmd)
+	// shell.RunRealtime(cmd)
 
-		cmd = append(basecmd, "go.wit.com/toolkits/andlabs")
-		log.Info("Running:", cmd)
-		shell.RunRealtime(cmd)
+	cmd = append(basecmd, "go.wit.com/apps/go-mod-clean")
+	log.Info("Running:", cmd)
+	shell.RunRealtime(cmd)
+	os.Exit(-1)
 
-		// should, after go-clone, be able to go build
-		/*
-			repo := me.forge.FindByGoPath("go.wit.com/lib/proto/forgepb")
-			if repo != nil {
-				repo.RunVerbose([]string{"autogenpb"})
-			}
-		*/
-	})
-	return howtoWin
+	cmd = append(basecmd, "go.wit.com/apps/forge")
+	log.Info("Running:", cmd)
+	shell.RunRealtime(cmd)
+
+	cmd = append(basecmd, "go.wit.com/toolkits/gocui")
+	log.Info("Running:", cmd)
+	shell.RunRealtime(cmd)
+
+	cmd = append(basecmd, "go.wit.com/toolkits/andlabs")
+	log.Info("Running:", cmd)
+	shell.RunRealtime(cmd)
+
+	// should, after go-clone, be able to go build
+	/*
+		repo := me.forge.FindByGoPath("go.wit.com/lib/proto/forgepb")
+		if repo != nil {
+			repo.RunVerbose([]string{"autogenpb"})
+		}
+	*/
 }