From e34ab5314a2aa659a66b72d4f8fb1e07fc7ba140 Mon Sep 17 00:00:00 2001
From: Will Eccles <will@eccles.dev>
Date: Tue, 19 Apr 2022 22:12:05 -0400
Subject: [PATCH] fix: make macOS config path match Linux (#143)

Also moves some variables around in vars_*.go to accommodate the fix.
---
 main.go         | 4 ++--
 vars.go         | 1 -
 vars_darwin.go  | 1 +
 vars_linux.go   | 1 +
 vars_windows.go | 1 +
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/main.go b/main.go
index b70a0df..ff04430 100644
--- a/main.go
+++ b/main.go
@@ -44,7 +44,7 @@ func main() {
 
 	// i honestly dont know what directories to use for this
 	switch runtime.GOOS {
-	case "linux":
+	case "linux", "darwin":
 		userDataDir = getenv("XDG_DATA_HOME", curuser.HomeDir + "/.local/share")
 	default:
 		// this is fine on windows, dont know about others
@@ -56,7 +56,7 @@ func main() {
 		defaultConfDir = filepath.Join(confDir, "hilbish")
 	} else {
 		// else do ~ substitution
-		defaultConfDir = expandHome(defaultConfDir)
+		defaultConfDir = filepath.Join(expandHome(defaultConfDir), "hilbish")
 	}
 	defaultConfPath = filepath.Join(defaultConfDir, "init.lua")
 	if defaultHistDir == "" {
diff --git a/vars.go b/vars.go
index 4bf4e62..9238ffb 100644
--- a/vars.go
+++ b/vars.go
@@ -3,7 +3,6 @@ package main
 // String vars that are free to be changed at compile time
 var (
 	version = "v2.0.0"
-	defaultConfDir = "" // ~ will be substituted for home, path for user's default config
 	defaultHistDir = ""
 	commonRequirePaths = "';./libs/?/init.lua;./?/init.lua;./?/?.lua'"
 
diff --git a/vars_darwin.go b/vars_darwin.go
index c969639..b780c23 100644
--- a/vars_darwin.go
+++ b/vars_darwin.go
@@ -17,4 +17,5 @@ var (
 	dataDir = "/usr/local/share/hilbish"
 	preloadPath = dataDir + "/prelude/init.lua"
 	sampleConfPath = dataDir + "/.hilbishrc.lua" // Path to default/sample config
+	defaultConfDir = getenv("XDG_CONFIG_HOME", "~/.config")
 )
diff --git a/vars_linux.go b/vars_linux.go
index 4bb23d3..5ea3ac5 100644
--- a/vars_linux.go
+++ b/vars_linux.go
@@ -17,4 +17,5 @@ var (
 	dataDir = "/usr/share/hilbish"
 	preloadPath = dataDir + "/prelude/init.lua"
 	sampleConfPath = dataDir + "/.hilbishrc.lua" // Path to default/sample config
+	defaultConfDir = ""
 )
diff --git a/vars_windows.go b/vars_windows.go
index 0867480..5e9878c 100644
--- a/vars_windows.go
+++ b/vars_windows.go
@@ -11,4 +11,5 @@ var (
 	dataDir = "~\\Appdata\\Roaming\\Hilbish" // ~ and \ gonna cry?
 	preloadPath = dataDir + "\\prelude\\init.lua"
 	sampleConfPath = dataDir + "\\hilbishrc.lua" // Path to default/sample config
+	defaultConfDir = ""
 )