summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--argv.template.go3
-rw-r--r--config.go8
2 files changed, 6 insertions, 5 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/config.go b/config.go
index 72f1caf..f91b1a1 100644
--- a/config.go
+++ b/config.go
@@ -14,7 +14,7 @@ import (
)
func configSave() error {
- return me.configs.ConfigSave()
+ return me.configs.Save()
}
func configInit() *forgepb.ForgeConfigs {
@@ -23,10 +23,10 @@ func configInit() *forgepb.ForgeConfigs {
}
configs := new(forgepb.ForgeConfigs)
- err := config.ConfigLoad(configs, APPNAME, "forge")
+ filename, err := config.LoadByAppName(configs, APPNAME)
if errors.Is(err, os.ErrNotExist) {
- configs.ReposDir = "/var/cache/forged"
- configs.ReposPB = filepath.Join(configs.ReposDir, "repos.pb")
+ ENV.Set("ReposDir", "/var/cache/forged")
+ ENV.Set("ReposPB", filepath.Join(ENV.Get("ReposDir"), "repos.pb"))
if err := configSave(); err != nil {
badExit(err)
}