From fd01ba0e7e10dc67ac12afb55e91d909727cfcbf Mon Sep 17 00:00:00 2001 From: Ben Abernathy Date: Sun, 19 Jun 2022 19:33:33 -0600 Subject: Mobius 38 - improve config dir flag. --- cmd/mobius-hotline-server/main.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go index 07bbc88..2f914c4 100644 --- a/cmd/mobius-hotline-server/main.go +++ b/cmd/mobius-hotline-server/main.go @@ -15,6 +15,7 @@ import ( "net/http" "os" "runtime" + "strings" "time" ) @@ -55,6 +56,10 @@ func main() { defer func() { _ = l.Sync() }() logger := l.Sugar() + if !(strings.HasSuffix(*configDir, "/") || strings.HasSuffix(*configDir, "\\")) { + *configDir = *configDir + "/" + } + if *init { if _, err := os.Stat(*configDir + "/config.yaml"); os.IsNotExist(err) { if err := os.MkdirAll(*configDir, 0750); err != nil { @@ -132,7 +137,7 @@ var zapLogLevel = map[string]zapcore.Level{ func defaultConfigPath() (cfgPath string) { switch runtime.GOOS { case "windows": - cfgPath = "config" + cfgPath = "config/" case "darwin": if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil { cfgPath = "/usr/local/var/mobius/config/" -- cgit