diff options
| author | Jeff Carr <[email protected]> | 2025-10-24 18:31:27 -0500 | 
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-10-24 18:31:27 -0500 | 
| commit | 213d7bd6749471c583534e76f9c29c5b0183a4cb (patch) | |
| tree | d654f6c457dcee698e40f0b245e22a55823961ee | |
| parent | 08f363db15952c41a433fa263940b27abcfb5615 (diff) | |
s/ENV/env/ but ENV really is better herev0.1.50
| -rw-r--r-- | argv.template.go | 4 | ||||
| -rw-r--r-- | doBuild.debian.go | 38 | ||||
| -rw-r--r-- | structs.go | 4 | 
3 files changed, 23 insertions, 23 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/doBuild.debian.go b/doBuild.debian.go index e8f497d..9fb1dc7 100644 --- a/doBuild.debian.go +++ b/doBuild.debian.go @@ -11,9 +11,9 @@ import (  	"strconv"  	"strings" -	"go.wit.com/lib/ENV"  	"go.wit.com/lib/cobol"  	"go.wit.com/lib/debian" +	"go.wit.com/lib/env"  	"go.wit.com/lib/fhelp"  	"go.wit.com/lib/gui/shell"  	"go.wit.com/lib/protobuf/gitpb" @@ -168,34 +168,34 @@ func shouldBuild(repo *gitpb.Repo) string {  func getBuildVersion(repo *gitpb.Repo) (int, error) {  	_, reponame := filepath.Split(repo.Namespace) -	if !ENV.InitValid() { -		log.Info("ENV.Get() InitValid() false", reponame) -		return 0, ENV.NotInitialized +	if !env.InitValid() { +		log.Info("env.Get() InitValid() false", reponame) +		return 0, env.NotInitialized  	} -	if ENV.Get(reponame) == "" { +	if env.Get(reponame) == "" {  		// first time for this repo -		ENV.Set(reponame, log.Sprintf("%s %s", repo.DebianCurrentVersion(0), "0")) -		err := ENV.Save() -		log.Info("ENV.Get() was blank", reponame, err) +		env.Set(reponame, log.Sprintf("%s %s", repo.DebianCurrentVersion(0), "0")) +		err := env.Save() +		log.Info("env.Get() was blank", reponame, err)  		return 0, err  	} -	parts := strings.Fields(ENV.Get(reponame)) -	// log.Printf("ENV.Get() worked var(%s) parts[%v]\n", reponame, parts) +	parts := strings.Fields(env.Get(reponame)) +	// log.Printf("env.Get() worked var(%s) parts[%v]\n", reponame, parts)  	if len(parts) != 2 { -		log.Info("ENV.Get() wierd setting. fix manually:", reponame, parts) +		log.Info("env.Get() wierd setting. fix manually:", reponame, parts)  		return 0, errors.New("fix manually in ~/.config/mirrors/config.text")  	}  	i, err := strconv.Atoi(parts[1])  	newi := i + 1  	if err != nil { -		log.Info("ENV.Save() strconv.Atoi() err:", reponame, parts, err) +		log.Info("env.Save() strconv.Atoi() err:", reponame, parts, err)  	} -	// log.Info("ENV.Get() worked", parts, err, i, newi) -	ENV.Set(reponame, log.Sprintf("%s %d", repo.DebianCurrentVersion(0), newi)) -	errors.Join(err, ENV.Save()) +	// log.Info("env.Get() worked", parts, err, i, newi) +	env.Set(reponame, log.Sprintf("%s %d", repo.DebianCurrentVersion(0), newi)) +	errors.Join(err, env.Save())  	if err != nil { -		log.Info("ENV.Save() err:", reponame, err) +		log.Info("env.Save() err:", reponame, err)  	}  	return newi, err  } @@ -235,10 +235,10 @@ func buildDeb(repo *gitpb.Repo) error {  		log.Info("WHY BUILD AUTOGEN HERE", reponame, bvers, err)  	}  	if err == nil { -		log.Info("ENV.Get() gave back new buildId", bvers, repo.Namespace) +		log.Info("env.Get() gave back new buildId", bvers, repo.Namespace)  	} else { -		log.Info("ENV.Get() gave back err new buildId", bvers, err, repo.Namespace) -		panic("ENV.Get() error") +		log.Info("env.Get() gave back err new buildId", bvers, err, repo.Namespace) +		panic("env.Get() error")  	}  	cmd = append(cmd, "--buildversion", log.Sprintf("%d", bvers)) @@ -7,8 +7,8 @@ import (  	"sync"  	"go.wit.com/dev/alexflint/arg" -	"go.wit.com/lib/ENV"  	"go.wit.com/lib/debian" +	"go.wit.com/lib/env"  	"go.wit.com/lib/fhelp"  	"go.wit.com/lib/protobuf/argvpb"  	"go.wit.com/lib/protobuf/forgepb" @@ -38,7 +38,7 @@ func initForge() {  		}  		me.forge.RescanRepos()  	} -	ENV.PrintTable() +	env.PrintTable()  	initMachine()  }  | 
