summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.go19
-rw-r--r--main.go5
2 files changed, 22 insertions, 2 deletions
diff --git a/config.go b/config.go
new file mode 100644
index 0000000..24f047a
--- /dev/null
+++ b/config.go
@@ -0,0 +1,19 @@
+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 {
+ configs := new(forgepb.ForgeConfigs)
+ err := config.ConfigLoad(configs, "forge", "forge")
+ if err != nil {
+ log.Info("This tool requires your repos be scanned by forge first")
+ badExit(err)
+ }
+ return configs
+}
diff --git a/main.go b/main.go
index ea2f6b9..d77d334 100644
--- a/main.go
+++ b/main.go
@@ -41,8 +41,9 @@ func main() {
state = make(map[*gitpb.Repo]string)
debnames = make(map[*gitpb.Repo]string)
- // load the ~/.config/forge/ config
- me.forge = forgepb.Init()
+ // read in forge info
+ cfg := configInit()
+ me.forge = forgepb.InitFromConfig(cfg)
me.machine = new(zoopb.Machine)
if err := me.machine.ConfigLoad(); err != nil {