redo mode handlingv0.25.52

1 files changed, 11 insertions, 16 deletions

diff --git a/main.go b/main.go
index 9ec860d..f756f92 100644
--- a/main.go
+++ b/main.go
@@ -97,8 +97,8 @@ func main() {
 		okExit("")
 	}
 
-	if argv.Normal != nil {
-		if argv.Normal.On != nil {
+	if argv.Mode != nil {
+		if argv.Mode.Normal != nil {
 			if me.forge.Config.Mode == forgepb.ForgeMode_NORMAL {
 				log.Info("you are already in the normal state")
 				okExit("")
@@ -108,22 +108,12 @@ func main() {
 			okExit("")
 		}
 
-		if argv.Normal.Off != nil {
-			if me.forge.Config.Mode != forgepb.ForgeMode_NORMAL {
-				log.Info("you were aleady not in the normal state")
-				okExit("")
-			}
-			setForgeMode(forgepb.ForgeMode_DEVEL)
-			log.Info("normal mode off")
+		if argv.Mode.User != nil {
+			setForgeMode(forgepb.ForgeMode_USER)
 			okExit("")
 		}
-
-		if doNormal() {
-			log.Infof("all %d repos are on your user branch. It is safe to write code now.\n", me.forge.Repos.Len())
-			if me.forge.Config.Mode != forgepb.ForgeMode_NORMAL {
-				log.Infof("Forge has set the mode to 'Normal'\n")
-				setForgeMode(forgepb.ForgeMode_NORMAL)
-			}
+		if argv.Mode.Master != nil {
+			setForgeMode(forgepb.ForgeMode_MASTER)
 			okExit("")
 		}
 		okExit("")
@@ -144,6 +134,11 @@ func main() {
 		okExit("")
 	}
 
+	if argv.Add != nil {
+		doAdd()
+		okExit("")
+	}
+
 	if argv.Pull != nil {
 		doPull()
 		okExit("")