Git
/
cheat
mirror of https://github.com/cheat/cheat.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #573 from chrisallenlane/linux-conf 

fix(config): add /etc/cheat config path
This commit is contained in:
Chris Allen Lane 2020-07-11 08:12:04 -04:00 committed by GitHub
parent 278a5d9154 c4dcfd5da0
commit ad7ad64a75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/cheat/main.go
View File

@ -17,7 +17,7 @@ import (
"github.com/cheat/cheat/internal/installer" "github.com/cheat/cheat/internal/installer"
) )
const version = "4.0.1" const version = "4.0.2"
func main() { func main() {

2
internal/config/paths.go
View File

@ -36,10 +36,10 @@ func Paths(
paths = append(paths, path.Join(xdgpath, "/cheat/conf.yml")) paths = append(paths, path.Join(xdgpath, "/cheat/conf.yml"))
} }
// if `XDG_CONFIG_HOME` is not set, search the user's home directory
paths = append(paths, []string{ paths = append(paths, []string{
path.Join(home, ".config/cheat/conf.yml"), path.Join(home, ".config/cheat/conf.yml"),
path.Join(home, ".cheat/conf.yml"), path.Join(home, ".cheat/conf.yml"),
"/etc/cheat/conf.yml",
}...) }...)
return paths, nil return paths, nil

2
internal/config/paths_test.go
View File

@ -39,6 +39,7 @@ func TestValidatePathsNix(t *testing.T) {
"/home/bar/cheat/conf.yml", "/home/bar/cheat/conf.yml",
"/home/foo/.config/cheat/conf.yml", "/home/foo/.config/cheat/conf.yml",
"/home/foo/.cheat/conf.yml", "/home/foo/.cheat/conf.yml",
"/etc/cheat/conf.yml",
} }
// assert that output matches expectations // assert that output matches expectations
@ -81,6 +82,7 @@ func TestValidatePathsNixNoXDG(t *testing.T) {
want := []string{ want := []string{
"/home/foo/.config/cheat/conf.yml", "/home/foo/.config/cheat/conf.yml",
"/home/foo/.cheat/conf.yml", "/home/foo/.cheat/conf.yml",
"/etc/cheat/conf.yml",
} }
// assert that output matches expectations // assert that output matches expectations