From b1f3a9eeec0485f828895bd20d7059d3e37303ad Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Thu, 7 Mar 2024 12:34:50 -0500 Subject: [PATCH] Properly set config file path on Windows --- src/offline/2globalsUNIX.go | 1 + src/offline/2globalsWIN.go | 1 + src/offline/configParser.go | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/offline/2globalsUNIX.go b/src/offline/2globalsUNIX.go index 0f38ce6..a2728ef 100644 --- a/src/offline/2globalsUNIX.go +++ b/src/offline/2globalsUNIX.go @@ -4,6 +4,7 @@ package offline // EntryRoot path to libmutton entry directory var EntryRoot = home + "/.local/share/libmutton" +var ConfigPath = home + "/.config/libmutton/libmutton.ini" // PathSeparator defines the character used to separate directories in a path (platform-specific) const PathSeparator = "/" diff --git a/src/offline/2globalsWIN.go b/src/offline/2globalsWIN.go index a831ae4..dfd2460 100644 --- a/src/offline/2globalsWIN.go +++ b/src/offline/2globalsWIN.go @@ -4,6 +4,7 @@ package offline // EntryRoot path to libmutton entry directory var EntryRoot = home + "\\AppData\\Local\\libmutton\\entries" +var ConfigPath = home + "\\AppData\\Local\\libmutton\\libmutton.ini" // PathSeparator defines the character used to separate directories in a path (platform-specific) const PathSeparator = "\\" diff --git a/src/offline/configParser.go b/src/offline/configParser.go index b2d1b34..2926ec9 100644 --- a/src/offline/configParser.go +++ b/src/offline/configParser.go @@ -10,7 +10,7 @@ import ( // requires readMap: a map of section names to key names (indicates requested values) // returns configMap: a map of key names to values (sections are irrelevant) func ReadConfig(readKeys []string) []string { - cfg, err := ini.Load(home + "/.config/libmutton/libmutton.ini") + cfg, err := ini.Load(ConfigPath) if err != nil { fmt.Println(AnsiError + "Failed to load libmutton.ini" + AnsiReset) os.Exit(1)