From 1d02f7a803c3bd58e5a4907cf72b2cdb9d439517 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Thu, 16 Oct 2025 03:30:33 -0500
Subject: try to fix the namespaces along the way

---
 argv.go      | 1 +
 doRebuild.go | 6 ++++++
 doVerify.go  | 9 +++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/argv.go b/argv.go
index 405ba90..4f7acd4 100644
--- a/argv.go
+++ b/argv.go
@@ -72,6 +72,7 @@ type FixCmd struct {
 type VerifyCmd struct {
 	Namespace *EmptyCmd `arg:"subcommand:namespace"               help:"check the namespaces"`
 	Stats     *StatsCmd `arg:"subcommand:stats"                   help:"generate origin.pb"`
+	DryRun    bool      `arg:"--dry-run"                          help:"try not to change anything"`
 }
 
 type StatsCmd struct {
diff --git a/doRebuild.go b/doRebuild.go
index e00ed53..e279240 100644
--- a/doRebuild.go
+++ b/doRebuild.go
@@ -46,6 +46,7 @@ func doRebuildForge() (string, error) {
 		cmd := []string{"go", "install", "go.wit.com/apps/go-mod-clean@latest"}
 		shell.RunRealtime(cmd)
 	}
+	doVerifyNamespace()
 	if path, err := fhelp.CheckCmd("go-clone"); err != nil {
 		pfile, _ := resources.ReadFile("resources/GOPATH")
 		log.Info("")
@@ -76,6 +77,7 @@ func doRebuildForge() (string, error) {
 	if r.Error != nil {
 		return "download go-mod-clean failed", r.Error
 	}
+	doVerifyNamespace()
 
 	cmd = append(basecmd, "go.wit.com/apps/autogenpb")
 	log.Info("Running:", cmd)
@@ -83,6 +85,7 @@ func doRebuildForge() (string, error) {
 	if r.Error != nil {
 		return "download autogenpb failed", r.Error
 	}
+	doVerifyNamespace()
 
 	cmd = append(basecmd, "go.wit.com/apps/forge")
 	log.Info("Running:", cmd)
@@ -90,6 +93,7 @@ func doRebuildForge() (string, error) {
 	if r.Error != nil {
 		me.sh.BadExit("download forge failed", r.Error)
 	}
+	doVerifyNamespace()
 
 	cmd = append(basecmd, "go.wit.com/toolkits/gocui")
 	log.Info("Running:", cmd)
@@ -97,6 +101,7 @@ func doRebuildForge() (string, error) {
 	if r.Error != nil {
 		me.sh.BadExit("download CUI GO plugin toolkit failed", r.Error)
 	}
+	doVerifyNamespace()
 
 	cmd = append(basecmd, "go.wit.com/toolkits/andlabs")
 	log.Info("Running:", cmd)
@@ -104,6 +109,7 @@ func doRebuildForge() (string, error) {
 	if r.Error != nil {
 		me.sh.BadExit("download GTK GO plugin toolkit failed", r.Error)
 	}
+	doVerifyNamespace()
 
 	if (me.forge == nil) || (me.forge.Repos == nil) {
 		log.Info("RUN forge --rebuild again. it might work after a few tries")
diff --git a/doVerify.go b/doVerify.go
index db5cf5e..35eed70 100644
--- a/doVerify.go
+++ b/doVerify.go
@@ -51,18 +51,19 @@ func doVerifyNamespace() (string, error) {
 		if newpath == "" {
 			// log.Info("didn't work", r.Namespace, "to", newpath)
 			// didn't work
+		} else if newpath == r.Namespace {
+			// already good namespace.
+			continue
 		} else if newpath != r.Namespace {
 			changed = true
 			log.Info("Changed", r.FullPath, "to", newpath)
 			r.Namespace = newpath
 			continue
-		} else {
-			// log.Info("Not Changed", r.Namespace, "to", newpath)
 		}
-		log.Info("not sure about", r.Namespace)
+		log.Info("cleanNamespace() didn't match", r.Namespace)
 	}
 
-	if changed {
+	if !argv.Verify.DryRun && changed {
 		me.forge.Repos.SaveVerbose()
 	}
 
-- 
cgit v1.2.3