apps/core
1
0
Fork 0
mirror of https://github.com/datarhei/core.git synced 2025-10-04 07:37:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix default search paths for config file

Browse Source
This commit is contained in:
Ingo Oppermann
2023-09-07 16:23:15 +02:00
parent f6d5064211
commit 0f4c88be39
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
config/store/location.go
View File

@@ -7,11 +7,11 @@ import (
// Location returns the path to the config file. If no path is provided, // Location returns the path to the config file. If no path is provided,
// different standard location will be probed: // different standard location will be probed:
// - os.UserConfigDir() + /datarhei-core/config.js // - os.UserConfigDir() + /datarhei-core/config.json
// - os.UserHomeDir() + /.config/datarhei-core/config.js // - os.UserHomeDir() + /.config/datarhei-core/config.json
// - ./config/config.js // - ./config/config.json
// If the config doesn't exist in none of these locations, it will be assumed // If the config doesn't exist in none of these locations, it will be assumed
// at ./config/config.js // at ./config/config.json
func Location(filepath string) string { func Location(filepath string) string {
configfile := filepath configfile := filepath
if len(configfile) != 0 { if len(configfile) != 0 {
@@ -22,13 +22,16 @@ func Location(filepath string) string {
if dir, err := os.UserConfigDir(); err == nil { if dir, err := os.UserConfigDir(); err == nil {
locations = append(locations, dir+"/datarhei-core/config.js") locations = append(locations, dir+"/datarhei-core/config.js")
locations = append(locations, dir+"/datarhei-core/config.json")
} }
if dir, err := os.UserHomeDir(); err == nil { if dir, err := os.UserHomeDir(); err == nil {
locations = append(locations, dir+"/.config/datarhei-core/config.js") locations = append(locations, dir+"/.config/datarhei-core/config.js")
locations = append(locations, dir+"/.config/datarhei-core/config.json")
} }
locations = append(locations, "./config/config.js") locations = append(locations, "./config/config.js")
locations = append(locations, "./config/config.json")
for _, path := range locations { for _, path := range locations {
info, err := os.Stat(path) info, err := os.Stat(path)
@@ -44,7 +47,7 @@ func Location(filepath string) string {
} }
if len(configfile) == 0 { if len(configfile) == 0 {
configfile = "./config/config.js" configfile = "./config/config.json"
} }
os.MkdirAll(path.Dir(configfile), 0740) os.MkdirAll(path.Dir(configfile), 0740)