From: Jeff Halter <redacted>
Date: Mon, 6 Jun 2022 23:46:10 +0000 (-0700)
Subject: Improve handling of client config default path
X-Git-Url: https://git.r.bdr.sh/rbdr/mobius/commitdiff_plain/f4a69647659df356f7f1d1ab1d8b4eedcc34dfba?hp=5350396308932e1dabdc10c7b342b528d2f60a15

Improve handling of client config default path
---

diff --git a/cmd/mobius-hotline-client/main.go b/cmd/mobius-hotline-client/main.go
index 6bc2d58..4bd40c9 100644
--- 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) {
-	os := runtime.GOOS
-	switch os {
+	switch runtime.GOOS {
 	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:
diff --git a/hotline/client.go b/hotline/client.go
index 24df7c3..1e2972f 100644
--- 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 {
-		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