From 6c60e24225760ea1ab33173e27c5764693788a9a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Wed, 8 Oct 2025 06:32:22 -0500 Subject: fixes on fixes --- Makefile | 2 +- debug.go | 3 +-- doDev.go | 2 ++ doFix.urls.go | 3 ++- main.go | 8 ++++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 7a545b0..3a4db19 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ default: install # forge pull check # This will re-generate ALL of the needed autogenerated .pb.go files -generate: +generate: clean go mod init go mod tidy go generate diff --git a/debug.go b/debug.go index a06dd76..5b5ddf1 100644 --- a/debug.go +++ b/debug.go @@ -12,7 +12,6 @@ import ( "path/filepath" "time" - "go.wit.com/dev/davecgh/spew" "go.wit.com/gui" "go.wit.com/lib/debugger" "go.wit.com/lib/gui/shell" @@ -53,7 +52,7 @@ func dumpDebug() { } log.Infof("%s built with Go version: %s\n", exePath, bi.GoVersion) - spew.Dump(bi) + // spew.Dump(bi) for _, dep := range bi.Deps { fmt.Printf("Dependency: %s %s\n", dep.Path, dep.Version) } diff --git a/doDev.go b/doDev.go index 57402cb..a17b7ea 100644 --- a/doDev.go +++ b/doDev.go @@ -6,6 +6,7 @@ package main import ( "errors" "fmt" + "os" ) var ErrorNeedArgvFix error = errors.New("add --fix") @@ -18,6 +19,7 @@ func doDev() (string, error) { if found == nil { return "", fmt.Errorf("unknown namespace %s", argv.Dev.Generate) } + os.Unsetenv("GO111MODULE") _, err := found.RunVerboseWithError([]string{"make", "generate"}) if err != nil { return "go generate failed", err diff --git a/doFix.urls.go b/doFix.urls.go index e516107..cf47004 100644 --- a/doFix.urls.go +++ b/doFix.urls.go @@ -84,6 +84,7 @@ func doFixUrls() error { count += 1 */ } - me.forge.PrintPullTable(updatecheck) + footer := me.forge.PrintPullTable(updatecheck) + log.Info("These repos have broken URLs. Fix them with --fix", footer) return nil } diff --git a/main.go b/main.go index af5d561..b60edec 100644 --- a/main.go +++ b/main.go @@ -89,6 +89,14 @@ func main() { me.sh.GoodExit(s) } + if argv.Fixer != nil { + s, err := doFix() + if err != nil { + me.sh.BadExit(s, err) + } + me.sh.GoodExit(s) + } + if argv.Clean != nil { if err := doClean(); err != nil { badExit(err) -- cgit v1.2.3