From a3e4731d23f4b7fbcf451b8446532bf3674b2734 Mon Sep 17 00:00:00 2001
From: Jeff Carr <jcarr@wit.com>
Date: Wed, 22 Oct 2025 16:47:48 -0500
Subject: actually load the ENV for real

---
 init.go | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'init.go')

diff --git a/init.go b/init.go
index dd176e2..39a604d 100644
--- a/init.go
+++ b/init.go
@@ -4,6 +4,8 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+
+	"go.wit.com/log"
 )
 
 // this is an experiment at this point to
@@ -24,20 +26,13 @@ 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()
@@ -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 {
-- 
cgit v1.2.3