diff options
| author | Jeff Carr <[email protected]> | 2025-10-21 06:40:33 -0500 |
|---|---|---|
| committer | Jeff Carr <[email protected]> | 2025-10-21 06:40:33 -0500 |
| commit | 46aae682f88cd9171e81d536d85436c2b6cfc469 (patch) | |
| tree | 7cf3dec84ef4342c1ca09e5a4a7b7a09e92133bd /doNormal.go | |
| parent | 9941532f439ac9774803db3328b66b158654efaf (diff) | |
use lib/ENV
Diffstat (limited to 'doNormal.go')
| -rw-r--r-- | doNormal.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/doNormal.go b/doNormal.go index 849122e..d9aee18 100644 --- a/doNormal.go +++ b/doNormal.go @@ -12,6 +12,7 @@ import ( "strings" "time" + "go.wit.com/lib/ENV" "go.wit.com/lib/config" "go.wit.com/lib/fhelp" "go.wit.com/lib/gui/shell" @@ -27,7 +28,7 @@ func doNormalAll() (string, error) { var err error me.curpatches = forgepb.NewPatches() - me.curpatches.Filename = config.Get("curpatches") + me.curpatches.Filename = ENV.Get("curpatches") if me.curpatches.Filename == "" { panic("config failed. no 'curpatches' set in ~/.config/forge/config.text") } @@ -39,7 +40,7 @@ func doNormalAll() (string, error) { // return // // THIS IS NEEDED? NOTSURE me.curpatches = forgepb.NewPatches() - me.curpatches.Filename = config.Get("curpatches") + me.curpatches.Filename = ENV.Get("curpatches") me.curpatches.Save() } @@ -155,11 +156,11 @@ func doNormalStatus() bool { // this also verifies that func checkNormalRepoState(repo *gitpb.Repo) error { var err error - tmp := filepath.Join(config.Get("gopath"), repo.GetNamespace()) + tmp := filepath.Join(ENV.Get("gopath"), repo.GetNamespace()) if tmp != repo.FullPath { log.Infof("%s != %s\n", repo.FullPath, tmp) - if strings.HasPrefix(repo.FullPath, config.Get("gopath")) { - tmp = strings.TrimPrefix(repo.FullPath, config.Get("gopath")) + if strings.HasPrefix(repo.FullPath, ENV.Get("gopath")) { + tmp = strings.TrimPrefix(repo.FullPath, ENV.Get("gopath")) tmp = strings.Trim(tmp, "/") repo.Namespace = tmp err = log.Errorf("namespace set to filepath") |