From 9742ae6cf2345f1f37a3cd0f912bfcb341e5d44a Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Fri, 24 Oct 2025 18:31:04 -0500 Subject: s/ENV/env/ but ENV really is better here --- argv.template.go | 4 ++-- exit.go | 4 ++-- finalGoDepsCheckOk.go | 4 ++-- main.go | 6 +++--- releaseBox.go | 8 ++++---- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/argv.template.go b/argv.template.go index 1808722..6948afe 100644 --- a/argv.template.go +++ b/argv.template.go @@ -10,7 +10,7 @@ import ( "go.wit.com/dev/alexflint/arg" "go.wit.com/gui" - "go.wit.com/lib/ENV" + "go.wit.com/lib/env" "go.wit.com/lib/fhelp" "go.wit.com/log" ) @@ -64,7 +64,7 @@ func (args) InitGui() error { func (args) Exit() { gui.UnloadToolkits() - if ENV.Verbose() { + if env.Verbose() { log.Info("argv.Exit() called", APPNAME+".Exit()") } // remove this from the template for your app (or make one for youself if you need it) diff --git a/exit.go b/exit.go index 80a2423..c09e912 100644 --- a/exit.go +++ b/exit.go @@ -1,7 +1,7 @@ package main import ( - "go.wit.com/lib/ENV" + "go.wit.com/lib/env" "go.wit.com/log" ) @@ -12,6 +12,6 @@ func okExit(thing string) { } func badExit(err error) { - log.Info("forge failed: ", err, ENV.Get("gopath")) + log.Info("forge failed: ", err, env.Get("gopath")) me.argv.BadExit("guireleaser", err) } diff --git a/finalGoDepsCheckOk.go b/finalGoDepsCheckOk.go index 6b0c2a1..6cdbaec 100644 --- a/finalGoDepsCheckOk.go +++ b/finalGoDepsCheckOk.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "go.wit.com/lib/ENV" + "go.wit.com/lib/env" "go.wit.com/lib/protobuf/gitpb" "go.wit.com/log" ) @@ -31,7 +31,7 @@ func testGoDepsCheckOk(godeps *gitpb.GoDeps) error { all := godeps.SortByGoPath() for all.Scan() { depRepo := all.Next() - fullpath := filepath.Join(ENV.Get("gopath"), depRepo.GoPath) + fullpath := filepath.Join(env.Get("gopath"), depRepo.GoPath) found := me.found.FindByFullPath(fullpath) if found == nil { continue diff --git a/main.go b/main.go index 59fa1be..d99e502 100644 --- a/main.go +++ b/main.go @@ -8,7 +8,7 @@ import ( "path/filepath" "time" - "go.wit.com/lib/ENV" + "go.wit.com/lib/env" "go.wit.com/lib/fhelp" "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/shell" @@ -24,7 +24,7 @@ var resources embed.FS func main() { me = new(autoType) me.argv = argvpb.Autocomplete(&argv) // adds shell auto complete to go-args - ENV.PrintTable() + env.PrintTable() me.forge, _ = forgepb.Init() me.found = new(gitpb.Repos) @@ -38,7 +38,7 @@ func main() { fhelp.CheckGoModCleanExit() - os.Setenv("REPO_WORK_PATH", ENV.Get("gopath")) + os.Setenv("REPO_WORK_PATH", env.Get("gopath")) // save the ENV var here me.releaseReasonS = os.Getenv("GUIRELEASE_REASON") diff --git a/releaseBox.go b/releaseBox.go index f2dff9d..5e31fb2 100644 --- a/releaseBox.go +++ b/releaseBox.go @@ -8,7 +8,7 @@ import ( "go.wit.com/gui" "go.wit.com/log" - "go.wit.com/lib/ENV" + "go.wit.com/lib/env" "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/shell" "go.wit.com/lib/protobuf/forgepb" @@ -81,8 +81,8 @@ func createReleaseBox(box *gui.Node) { } finalGoDepsCheckOk(check) }) - me.release.grid.NewButton("ENV.PrintTable()", func() { - ENV.PrintTable() + me.release.grid.NewButton("env.PrintTable()", func() { + env.PrintTable() }) me.release.grid.NextRow() @@ -108,7 +108,7 @@ func createReleaseBox(box *gui.Node) { me.release.grid.NextRow() // me.userHomePwd.SetText(homeDir) - me.goSrcPwd.SetText(ENV.Get("gopath")) + me.goSrcPwd.SetText(env.Get("gopath")) group := me.release.box.NewGroup("Run on Current Repo") grid := group.NewGrid("buildOptions", 0, 0) -- cgit v1.2.3