catch some nil panics

3 files changed, 17 insertions, 4 deletions

diff --git a/defaultBehavior.go b/defaultBehavior.go
index 17cf895..e7d3c52 100644
--- a/defaultBehavior.go
+++ b/defaultBehavior.go
@@ -6,11 +6,14 @@ package main
 import (
 	"errors"
 
+	"go.wit.com/lib/env"
 	"go.wit.com/log"
 )
 
 func doDefaultBehavior() (string, error) {
-	log.Info("forge is in mode", me.forge.GetMode())
+	if env.Verbose() {
+		log.Info("forge is in mode", me.forge.GetMode())
+	}
 	if me.forge.IsModeUnknown() {
 		panic("forge is UNKNOWN. this should have never happened")
 	}
diff --git a/doPatch.go b/doPatch.go
index 3a3a688..c7aeca9 100644
--- a/doPatch.go
+++ b/doPatch.go
@@ -66,7 +66,13 @@ func doPatch() (string, error) {
 	}
 
 	psets := forgepb.NewSets()
-	newpb, _, _ := psets.HttpPostVerbose(myServer(), "get")
+	newpb, _, err := psets.HttpPostVerbose(myServer(), "get")
+	if err != nil {
+		return "http post failed", err
+	}
+	if newpb == nil {
+		return "psets.HttpPost returned nil", err
+	}
 	footer, err := doPatchGet(newpb)
 	if footer == "" {
 		log.Info(footer)
@@ -323,6 +329,9 @@ func applyPatch(repo *gitpb.Repo, p *forgepb.Patch) (string, error) {
 
 func doPatchGet(newpb *forgepb.Sets) (string, error) {
 	newpatches := forgepb.NewPatches()
+	if newpb == nil {
+		return "doPatchGet() newpb == nil", errors.New("doPatchGet() newpb == nil")
+	}
 	for pset := range newpb.IterAll() {
 		if pset.Patches.Len() == 0 {
 			log.Info("pset is empty", pset.Name)
diff --git a/main.go b/main.go
index bf59e57..1d59034 100644
--- a/main.go
+++ b/main.go
@@ -20,7 +20,6 @@ import (
 var resources embed.FS
 
 func doCoreChecks() {
-	// env.PrintTable()
 	me.forge.RescanRepos() // looks for new dirs, checks existing repos for changes
 
 	// if you are in "normal" mode, always run normal every time to catch accidental errors
@@ -51,7 +50,9 @@ func main() {
 		log.Printf("forge failure on Init err=(%v)\n", err)
 		me.argv.BadExit("WTF", err)
 	}
-	env.PrintTable()
+	if env.Verbose() {
+		env.PrintTable()
+	}
 
 	if me.forge.IsModeUnknown() || me.forge.IsModeNewUser() {
 		doNewUser()