breakout a part3

1 files changed, 37 insertions, 16 deletions

diff --git a/doRebuild.go b/doRebuild.go
index a3131d9..717f35d 100644
--- a/doRebuild.go
+++ b/doRebuild.go
@@ -12,6 +12,7 @@ import (
 
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gui/shell"
+	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/log"
 )
 
@@ -47,26 +48,22 @@ func doRebuildForge() (string, error) {
 			return s, err
 		}
 	}
-	s, err = doVerifyNamespace()
+	forge, err := doRebuildPart3()
 	if err != nil {
-		log.Info("doVerifyNamespace() failed", err)
-		return s, err
+		log.Info("build Part3 failed", err)
+		s, err = doVerifyNamespace()
+		if err != nil {
+			log.Info("doVerifyNamespace() failed", err)
+			return s, err
+		}
 	}
 
-	repo := me.forge.Repos.FindByNamespace("go.wit.com/apps/forge")
-	if repo == nil {
-		_, err := shell.RunVerbose([]string{"forge", "show"})
-		return "still can't find the forge sources", err
-	}
-	log.Info("trying build Part3")
-	// yay. it might work
-	os.Chdir(repo.FullPath)
-	r := shell.RunRealtime([]string{"make", "generate"})
-	if r.Exit != 0 {
-		log.Info("make generate failed", r.Exit)
-		return "make generate error", errors.New("-1")
+	// finally try 'make' in the forge sources
+	err = forge.RunVerbose([]string{"make"})
+	if err != nil {
+		return "make failed", err
 	}
-	return "make generate might have worked", nil
+	return "all is well?", nil
 }
 
 func doRebuildPart1() (string, error) {
@@ -165,3 +162,27 @@ func doRebuildPart2() (string, error) {
 	}
 	return "build part2 might have worked", err
 }
+
+func doRebuildPart3() (*gitpb.Repo, error) {
+	_, err := doVerifyNamespace()
+	if err != nil {
+		log.Info("doVerifyNamespace() failed", err)
+		return nil, err
+	}
+
+	repo := me.forge.Repos.FindByNamespace("go.wit.com/apps/forge")
+	if repo == nil {
+		_, err := shell.RunVerbose([]string{"forge", "show"})
+		log.Info("still can't find the forge sources", err)
+		return nil, err
+	}
+	log.Info("trying build Part3")
+	// yay. it might work
+	os.Chdir(repo.FullPath)
+	r := shell.RunRealtime([]string{"make", "generate"})
+	if r.Exit != 0 {
+		log.Info("make generate failed", r.Exit)
+		return nil, errors.New("make generate failed -1")
+	}
+	return repo, nil
+}