diff options
| -rw-r--r-- | config.go | 18 | ||||
| -rw-r--r-- | main.go | 6 |
2 files changed, 12 insertions, 12 deletions
@@ -13,10 +13,10 @@ import ( ) func configSave() error { - return config.ConfigSave(me.configs) + return me.configs.ConfigSave() } -func (me *mainType) configInit() error { +func configInit() *forgepb.ForgeConfigs { if argv.Hostname != "" { HOSTNAME = argv.Hostname } @@ -30,20 +30,20 @@ func (me *mainType) configInit() error { os.Setenv("FORGE_PATCHDIR", "/var/lib/forged") } - me.configs = new(forgepb.ForgeConfigs) - err := config.ConfigLoad(me.configs, ARGNAME, "forge") + configs := new(forgepb.ForgeConfigs) + err := config.ConfigLoad(configs, ARGNAME, "forge") if errors.Is(err, os.ErrNotExist) { - me.configs.ReposDir = "/home/forge" - me.configs.ReposPB = "/home/forge/repos.pb" - me.configs.PatchDir = "/var/lib/forged" + configs.ReposDir = "/home/forge" + configs.ReposPB = "/home/forge/repos.pb" + configs.PatchDir = "/var/lib/forged" if err := configSave(); err != nil { badExit(err) } - log.Info("made a default config file here", me.configs.Filename) + log.Info("made a default config file here", configs.Filename) okExit("") } if err != nil { badExit(err) } - return err + return configs } @@ -30,9 +30,9 @@ func main() { me.myGui = prep.Gui() // prepares the GUI package for go-args me.pp = arg.MustParse(&argv) - me.configInit() // reads in the config file - - me.forge = forgepb.RawInitPB() + // read in forge info + cfg := configInit() + me.forge = forgepb.InitFromConfig(cfg) if err := me.forge.InitPatchsets(); err != nil { log.Info("patches failed to open", err) |