]> git.r.bdr.sh - rbdr/mobius/commitdiff
Mobius 38 - improve config dir flag.
authorBen Abernathy <redacted>
Mon, 20 Jun 2022 01:33:33 +0000 (19:33 -0600)
committerBen Abernathy <redacted>
Mon, 20 Jun 2022 01:33:33 +0000 (19:33 -0600)
cmd/mobius-hotline-server/main.go

index 07bbc88f5fe982feb4bcd7aabd47f41f79f6eb59..2f914c4d1f6a34242dfd180b50ddd67ecb2a1598 100644 (file)
@@ -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/"