From: Jeff Halter Date: Mon, 13 Jun 2022 00:41:30 +0000 (-0700) Subject: Simplify the behavior of init with an existing config X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/6936ce913c5b2db003cff5624ca5f92c6f4c5ebc Simplify the behavior of init with an existing config Old behavior: if config dir found, exit with message New behavior: if config dir found, log a message and continue This simplifies the process for new users. --- diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go index cf3c5a9..07bbc88 100644 --- a/cmd/mobius-hotline-server/main.go +++ b/cmd/mobius-hotline-server/main.go @@ -56,16 +56,18 @@ func main() { logger := l.Sugar() if *init { - if _, err := os.Stat(*configDir + "/config.yaml"); !os.IsNotExist(err) { - logger.Fatalw("Init failed. Existing config directory found: " + *configDir) - } + if _, err := os.Stat(*configDir + "/config.yaml"); os.IsNotExist(err) { + if err := os.MkdirAll(*configDir, 0750); err != nil { + logger.Fatal(err) + } - if err := os.MkdirAll(*configDir, 0750); err != nil { - logger.Fatal(err) - } + if err := copyDir("mobius/config", *configDir); err != nil { + logger.Fatal(err) + } + logger.Infow("Config dir initialized at " + *configDir) - if err := copyDir("mobius/config", *configDir); err != nil { - logger.Fatal(err) + } else { + logger.Infow("Existing config dir found. Skipping initialization.") } }