diff options
Diffstat (limited to 'Load.go')
| -rw-r--r-- | Load.go | 17 |
1 files changed, 11 insertions, 6 deletions
@@ -21,10 +21,11 @@ import ( ) func (pb *ForgeConfigs) loadConfig() error { - filename, err := config.LoadByAppName(pb, "forge", "forge") - log.Printf("%s loadConfig() about to load Config from %s\n", argvpb.GetAPPNAME(), filename) + pb.Filename = config.MakeConfigFilename("forge", "forge") + err := config.ReLoad(pb) + log.Printf("%s loadConfig() about to load Config from %s\n", argvpb.GetAPPNAME(), pb.Filename) if err != nil { - log.Info("couldn't load filename:", filename) + log.Info("couldn't load filename:", pb.Filename) log.Info("forge has not been configured") panic("config failed to load. make a new/blank forge config here?") } @@ -56,8 +57,11 @@ func (f *Forge) reposCacheLoad() error { return errors.New("already loaded") } f.Repos = gitpb.NewRepos() - err := config.LoadAppnameCache(f.Repos, "forge") - ENV.SetGlobal("lib/forgepb", "ReposPB", f.Repos.Filename) + f.Repos.Filename = config.MakeCacheFilename("forge", "repos") + err := config.ReLoad(f.Repos) + if err == nil { + ENV.SetGlobal("lib/forgepb", "ReposPB", f.Repos.Filename) + } return err } @@ -66,7 +70,8 @@ func (f *Forge) patchesCacheLoad() error { return errors.New("already loaded") } f.Patches = NewPatches() - err := config.LoadAppnameCache(f.Patches, "forge") + f.Patches.Filename = config.MakeCacheFilename("forge", "patches") + err := config.ReLoad(f.Patches) if errors.Is(err, os.ErrNotExist) { // is a new file f.Patches.Save() |