diff options
| -rw-r--r-- | config.go | 9 | ||||
| -rw-r--r-- | main.go | 6 | ||||
| -rw-r--r-- | releaseBox.go | 7 |
3 files changed, 14 insertions, 8 deletions
@@ -3,12 +3,17 @@ package main import ( "go.wit.com/lib/config" "go.wit.com/lib/protobuf/forgepb" + "go.wit.com/log" ) // sent via -ldflags -func configInit() (*forgepb.ForgeConfigs, error) { +func configInit() *forgepb.ForgeConfigs { configs := new(forgepb.ForgeConfigs) err := config.ConfigLoad(configs, "forge", "forge") - return configs, err + if err != nil { + log.Info("This tool requires your repos be scanned by forge first") + badExit(err) + } + return configs } @@ -31,8 +31,10 @@ func main() { me.myGui = prep.Gui() // prepares the GUI package for go-args me.pp = arg.MustParse(&argv) - // load the ~/.config/forge/ config - me.forge = forgepb.Init() + // read in forge info + cfg := configInit() + me.forge = forgepb.InitFromConfig(cfg) + me.found = new(gitpb.Repos) fhelp.CheckGoModCleanExit() diff --git a/releaseBox.go b/releaseBox.go index 8a5e1cc..e47b0f3 100644 --- a/releaseBox.go +++ b/releaseBox.go @@ -11,7 +11,6 @@ import ( "go.wit.com/lib/gadgets" "go.wit.com/lib/gui/repolist" "go.wit.com/lib/gui/shell" - "go.wit.com/lib/protobuf/forgepb" "go.wit.com/lib/protobuf/gitpb" ) @@ -156,9 +155,9 @@ func doReleaseAll() { func skipToNext() error { shell.RunVerbose([]string{"forge", "dirty"}) - log.Info("Sleeping for 10 seconds. Forge file should have been rewritten") - time.Sleep(10) - me.forge = forgepb.Init() + log.Info("Sleeping for 3 seconds. Forge file should have been rewritten") + time.Sleep(3) + me.forge.InitScan() me.found = new(gitpb.Repos) me.current.Reload() |