trying to get this to run again

1 files changed, 20 insertions, 8 deletions

diff --git a/main.go b/main.go
index fb7cc67..85dcbb1 100644
--- a/main.go
+++ b/main.go
@@ -42,28 +42,42 @@ func doInit() *forgepb.Forge {
 }
 
 func doCoreChecks() {
-	me.forge.ScanRepoDir() // looks for new dirs, checks existing repos for changes
+	me.forge.RescanRepos() // looks for new dirs, checks existing repos for changes
 
-	if me.forge.Mode != forgepb.ForgeMode_NORMAL {
+	if !me.forge.IsModeNormal() {
 		forgepb.DumpENV()
 	}
-	if me.forge.Mode == forgepb.ForgeMode_DEVEL {
+	if me.forge.IsModeDevel() {
 		dumpDebug()
 	}
 
 	// if you are in "normal" mode, always run normal every time to catch accidental errors
 	// for example, if you accidentally changed branches from your user branch
-	if me.forge.Mode == forgepb.ForgeMode_NORMAL {
+	if me.forge.IsModeNormal() {
 		// show what is still normal and what is not
-		doNormalStatus()
+		if doNormalStatus() {
+			log.Info("things are still normal")
+		} else {
+			log.Info("things are not normal anymore")
+		}
 	}
 
 }
 
 func main() {
+	var s string
+	var err error
 	me = new(mainType)
 	me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args
-	me.forge = doInit()                  // init's forge (and checks for new users)
+	me.forge, err = forgepb.Init()
+	if err != nil {
+		log.Printf("forge failure on Init err=(%v)\n", err)
+		me.argv.BadExit("WTF", err)
+	}
+
+	if me.forge.IsModeUnknown() || me.forge.IsModeNewUser() {
+		doNewUser()
+	}
 
 	// put things to do every time forge runs here
 	doCoreChecks()
@@ -80,8 +94,6 @@ func main() {
 
 	log.Info("Starting forge with subcommand:", me.argv.Cmd)
 
-	var s string
-	var err error
 	s, err = doSubcommand()
 
 	// safe exits back to your shell (with timing and toolkit close)