go/lazygit
1
0
Fork 0
mirror of https://github.com/jesseduffield/lazygit.git synced 2025-02-03 13:21:56 +02:00
Code Issues Releases Activity

use shibukawa/configdir package to follow xdg spec config directory structure

Browse Source
This commit is contained in:
Jesse Duffield 2018-08-16 19:17:38 +10:00
parent fd3ce21576
commit 5819e04c53
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/config/app_config.go
View File

@ -3,10 +3,9 @@ package config
import (
"bytes"
"log"
"os"
"os/user"
"path/filepath"
"github.com/shibukawa/configdir"
"github.com/spf13/viper"
)
@ -89,15 +88,20 @@ func LoadUserConfig() (*viper.Viper, error) {
return nil, err
}
v.SetConfigName("config")
configPath := homeDirectory() + "/lazygit/"
if _, err := os.Stat(filepath.FromSlash(configPath + "config.yaml")); !os.IsNotExist(err) {
v.AddConfigPath(configPath)
err = v.MergeInConfig()
// chucking my name there is not for vanity purposes, the xdg spec (and that
// function) requires a vendor name. May as well line up with github
configDirs := configdir.New("jesseduffield", "lazygit")
folder := configDirs.QueryFolderContainsFile("config.yml")
if folder != nil {
configData, err := folder.ReadFile("config.yml")
if err != nil {
return nil, err
}
if err = v.MergeConfig(bytes.NewReader(configData)); err != nil {
return nil, err
}
}
return v, nil
}