Mobius 38 - improve config dir flag.

[rbdr/mobius] / cmd / mobius-hotline-server / main.go

diff --git a/cmd/mobius-hotline-server/main.go b/cmd/mobius-hotline-server/main.go
index cf3c5a974672edd4b486f871cd7c58f6e626a0c0..2f914c4d1f6a34242dfd180b50ddd67ecb2a1598 100644 (file)
--- a/cmd/mobius-hotline-server/main.go
+++ b/cmd/mobius-hotline-server/main.go
@@ -15,6 +15,7 @@ import (
        "net/http"
        "os"
        "runtime"
        "net/http"
        "os"
        "runtime"

+       "strings"

        "time"
 )
 
        "time"
 )
 


@@ -55,17 +56,23 @@ func main() {
        defer func() { _ = l.Sync() }()
        logger := l.Sugar()
 
        defer func() { _ = l.Sync() }()
        logger := l.Sugar()
 

+       if !(strings.HasSuffix(*configDir, "/") || strings.HasSuffix(*configDir, "\\")) {
+               *configDir = *configDir + "/"
+       }
+

        if *init {
        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.")

                }
        }
 
                }
        }
 


@@ -130,7 +137,7 @@ var zapLogLevel = map[string]zapcore.Level{
 func defaultConfigPath() (cfgPath string) {
        switch runtime.GOOS {
        case "windows":
 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/"
        case "darwin":
                if _, err := os.Stat("/usr/local/var/mobius/config/"); err == nil {
                        cfgPath = "/usr/local/var/mobius/config/"