Improve handling of client config default path

diff --git a/cmd/mobius-hotline-client/main.go b/cmd/mobius-hotline-client/main.go
index 6bc2d58bce15bd25d9b3c9a43b96aa8def666def..4bd40c9b124ff7fd49888dae8f5a01584f044608 100644 (file)
--- a/cmd/mobius-hotline-client/main.go
+++ b/cmd/mobius-hotline-client/main.go
@@ -97,12 +97,15 @@ var zapLogLevel = map[string]zapcore.Level{
 }
 
 func defaultConfigPath() (cfgPath string) {
 }
 
 func defaultConfigPath() (cfgPath string) {

-       os := runtime.GOOS
-       switch os {
+       switch runtime.GOOS {

        case "windows":
                cfgPath = "mobius-client-config.yaml"
        case "darwin":
        case "windows":
                cfgPath = "mobius-client-config.yaml"
        case "darwin":

-               cfgPath = "/usr/local/etc/mobius-client-config.yaml"
+               if _, err := os.Stat("/usr/local/etc/mobius-client-config.yaml"); err == nil {
+                       cfgPath = "/usr/local/etc/mobius-client-config.yaml"
+               } else if _, err := os.Stat("/opt/homebrew/etc/mobius-client-config.yaml"); err == nil {
+                       cfgPath = "/opt/homebrew/etc/mobius-client-config.yaml"
+               }

        case "linux":
                cfgPath = "/usr/local/etc/mobius-client-config.yaml"
        default:
        case "linux":
                cfgPath = "/usr/local/etc/mobius-client-config.yaml"
        default:

diff --git a/hotline/client.go b/hotline/client.go
index 24df7c35aa8caddf1c6084d96d2860dc1883bb0e..1e2972f6c8aa18c3e48a6985776641f1142c76ed 100644 (file)
--- a/hotline/client.go
+++ b/hotline/client.go
@@ -103,8 +103,7 @@ func NewClient(cfgPath string, logger *zap.SugaredLogger) *Client {
 
        prefs, err := readConfig(cfgPath)
        if err != nil {
 
        prefs, err := readConfig(cfgPath)
        if err != nil {

-               fmt.Printf("unable to read config file %s", cfgPath)
-               os.Exit(1)
+               logger.Fatal(fmt.Sprintf("unable to read config file %s\n", cfgPath))

        }
        c.pref = prefs
 
        }
        c.pref = prefs