diff options
| -rw-r--r-- | config.go | 49 | ||||
| -rw-r--r-- | main.go | 14 | ||||
| -rw-r--r-- | structs.go | 7 |
3 files changed, 54 insertions, 16 deletions
diff --git a/config.go b/config.go new file mode 100644 index 0000000..51d0110 --- /dev/null +++ b/config.go @@ -0,0 +1,49 @@ +package main + +// functions to import and export the protobuf +// data to and from config files + +import ( + "errors" + "os" + + "go.wit.com/lib/config" + "go.wit.com/lib/protobuf/forgepb" + "go.wit.com/log" +) + +func configSave() error { + return config.ConfigSave(me.configs) +} + +func (me *mainType) configInit() error { + if argv.Hostname != "" { + HOSTNAME = argv.Hostname + } + + // the default forged dir is /home/forge + if os.Getenv("FORGE_GOSRC") == "" { + os.Setenv("FORGE_GOSRC", "/home/forge") + } + + if os.Getenv("FORGE_PATCHDIR") == "" { + os.Setenv("FORGE_PATCHDIR", "/var/lib/forged") + } + + me.configs = new(forgepb.ForgeConfigs) + err := config.ConfigLoad(me.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" + if err := configSave(); err != nil { + badExit(err) + } + log.Info("made a default config file here", me.configs.Filename) + okExit("") + } + if err != nil { + badExit(err) + } + return err +} @@ -4,7 +4,6 @@ import ( "embed" "fmt" "net/http" - "os" "time" "go.wit.com/dev/alexflint/arg" @@ -31,18 +30,7 @@ func main() { me.myGui = prep.Gui() // prepares the GUI package for go-args me.pp = arg.MustParse(&argv) - if argv.Hostname != "" { - HOSTNAME = argv.Hostname - } - - // the default forged dir is /home/forge - if os.Getenv("FORGE_GOSRC") == "" { - os.Setenv("FORGE_GOSRC", "/home/forge") - } - - if os.Getenv("FORGE_PATCHDIR") == "" { - os.Setenv("FORGE_PATCHDIR", "/var/lib/forged") - } + me.configInit() // reads in the config file me.forge = forgepb.RawInitPB() @@ -13,7 +13,8 @@ var me *mainType // this app's variables type mainType struct { - pp *arg.Parser // for parsing the command line args. Yay to alexf lint! - forge *forgepb.Forge // for holding the forge protobuf files - myGui *prep.GuiPrep // the gui toolkit handle + pp *arg.Parser // for parsing the command line args. Yay to alexf lint! + forge *forgepb.Forge // for holding the forge protobuf files + myGui *prep.GuiPrep // the gui toolkit handle + configs *forgepb.ForgeConfigs // for holding the forge protobuf files } |