use ENV

2 files changed, 21 insertions, 20 deletions

diff --git a/argv.template.go b/argv.template.go
index e7a9948..1808722 100644
--- a/argv.template.go
+++ b/argv.template.go
@@ -10,6 +10,7 @@ import (
 
 	"go.wit.com/dev/alexflint/arg"
 	"go.wit.com/gui"
+	"go.wit.com/lib/ENV"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/log"
 )
@@ -63,7 +64,7 @@ func (args) InitGui() error {
 
 func (args) Exit() {
 	gui.UnloadToolkits()
-	if me.argv.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 1694466..570ef94 100644
--- a/doBuild.debian.go
+++ b/doBuild.debian.go
@@ -10,7 +10,7 @@ import (
 	"strconv"
 	"strings"
 
-	"go.wit.com/lib/config"
+	"go.wit.com/lib/ENV"
 	"go.wit.com/lib/debian"
 	"go.wit.com/lib/fhelp"
 	"go.wit.com/lib/gui/shell"
@@ -146,34 +146,34 @@ func shouldBuild(repo *gitpb.Repo) string {
 
 func getBuildVersion(repo *gitpb.Repo) (int, error) {
 	_, reponame := filepath.Split(repo.Namespace)
-	if !config.InitValid() {
-		log.Info("Config.Get() InitValid() false", reponame)
-		return 0, config.NotInitialized
+	if !ENV.InitValid() {
+		log.Info("ENV.Get() InitValid() false", reponame)
+		return 0, ENV.NotInitialized
 	}
-	if config.Get(reponame) == "" {
+	if ENV.Get(reponame) == "" {
 		// first time for this repo
-		config.Set(reponame, log.Sprintf("%s %s", repo.DebianCurrentVersion(0), "0"))
-		err := config.Save()
-		log.Info("Config.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(config.Get(reponame))
-	// log.Printf("Config.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("Config.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("Config.Save() strconv.Atoi() err:", reponame, parts, err)
+		log.Info("ENV.Save() strconv.Atoi() err:", reponame, parts, err)
 	}
 
-	// log.Info("Config.Get() worked", parts, err, i, newi)
-	config.Set(reponame, log.Sprintf("%s %d", repo.DebianCurrentVersion(0), newi))
-	errors.Join(err, config.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("Config.Save() err:", reponame, err)
+		log.Info("ENV.Save() err:", reponame, err)
 	}
 	return newi, err
 }
@@ -213,10 +213,10 @@ func buildDeb(repo *gitpb.Repo) error {
 		log.Info("WHY BUILD AUTOGEN HERE", reponame, bvers, err)
 	}
 	if err == nil {
-		log.Info("Config.Get() gave back new buildId", bvers, repo.Namespace)
+		log.Info("ENV.Get() gave back new buildId", bvers, repo.Namespace)
 	} else {
-		log.Info("Config.Get() gave back err new buildId", bvers, err, repo.Namespace)
-		panic("config.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))