diff options
Diffstat (limited to 'config.go')
| -rw-r--r-- | config.go | 18 |
1 files changed, 9 insertions, 9 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 } |