diff options
| -rw-r--r-- | init.go | 16 |
1 files changed, 6 insertions, 10 deletions
@@ -4,6 +4,8 @@ import ( "os" "path/filepath" "strings" + + "go.wit.com/log" ) // this is an experiment at this point to @@ -24,21 +26,14 @@ func Init(appname, version, buildtime string, fromargv []string, goodFunc func(s envPB = NewKeys() envPB.Init = true + loadAppENV() + SetGlobal("lib/ENV", "APPNAME", APPNAME) SetGlobal("lib/ENV", "VERSION", VERSION) SetGlobal("lib/ENV", "BUILDTIME", BUILDTIME) } // if it exists, loads ~/.config/<appname>/<appname>.ENV -func InitENV() error { - err := loadAppENV() - - // TODO: load /usr/share/doc/<appname>.ENV - // TODO: load /etc/default/<appname> - return err -} - -// if it exists, loads ~/.config/<appname>/<appname>.ENV func loadAppENV() error { saveMu.Lock() saveMu.Unlock() @@ -47,7 +42,8 @@ func loadAppENV() error { return err } - envPB.Filename = filepath.Join(configDir, APPNAME+".ENV") + envPB.Filename = filepath.Join(configDir, APPNAME, APPNAME+".ENV") + // log.Info("envPB.Filename", envPB.Filename) data, err := os.ReadFile(envPB.Filename) if err != nil { |