remove env

This commit is contained in:
shoopea
2021-11-07 00:25:42 +08:00
parent 180baa1bb2
commit f85da9b418
6 changed files with 13 additions and 29 deletions

27
main.go
View File

@@ -5,20 +5,15 @@ import (
"time"
_ "embed"
"github.com/ianschenck/envflag"
)
var (
cfg *Config
srv *ServerTTD
bot *Bot
configFile string
cfg *Config
srv *ServerTTD
bot *Bot
configFlag = flag.String("config", "", "config file")
configFlag = flag.String("config", "config.json", "config file")
initFlag = flag.Bool("init", false, "init config")
configEnv = envflag.String("CONFIG", "", "config file")
initEnv = envflag.Bool("INIT", false, "init config")
)
func main() {
@@ -26,23 +21,15 @@ func main() {
flag.Parse()
if *configFlag != "" {
configFile = *configFlag
} else if *configEnv != "" {
configFile = *configEnv
} else {
configFile = "config.json"
}
cfg = &Config{}
if *initFlag || *initEnv {
if *initFlag {
logInfoWarn("Initializing configuration..")
err = cfg.Init()
failError(err, "Cannot init config")
err = cfg.Save(configFile)
err = cfg.Save(*configFlag)
failError(err, "Cannot save config")
} else {
err = cfg.Load(configFile)
err = cfg.Load(*configFlag)
failError(err, "Cannot open config")
}