rudi/kbtui
1
0
Fork 0
mirror of https://github.com/Rudi9719/kbtui.git synced 2026-03-22 09:57:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #50 from erAck/fix-home-expansion

Browse Source 
"~/" does not work as hoped for
This commit is contained in:
Gregory Rudolph
2019-12-16 07:48:00 -05:00
committed by GitHub
parent 9a71d50ab7 84e5beada4
commit 12d41c018e
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cmdConfig.go
View File

@ -50,7 +50,7 @@ func cmdConfig(cmd []string) {
func readConfig(filepath ...string) (*Config, error) { func readConfig(filepath ...string) (*Config, error) {
var result = new(Config) var result = new(Config)
var configFile string var configFile, path string
var env bool var env bool
// Load default config first, this way any values missing from the provided config file will remain the default value // Load default config first, this way any values missing from the provided config file will remain the default value
@ -61,8 +61,13 @@ func readConfig(filepath ...string) (*Config, error) {
case 0: case 0:
configFile, env = os.LookupEnv("KBTUI_CFG") configFile, env = os.LookupEnv("KBTUI_CFG")
if !env { if !env {
configFile = "~/.config/kbtui.toml" path, env = os.LookupEnv("HOME")
if _, err := os.Stat(configFile); os.IsNotExist(err) { if env {
configFile = path + "/.config/kbtui.toml"
if _, err := os.Stat(configFile); os.IsNotExist(err) {
configFile = "kbtui.toml"
}
} else {
configFile = "kbtui.toml" configFile = "kbtui.toml"
} }
} }