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

Merge "osutil: change paths to be xdg compliant"

This commit is contained in:
Brad Fitzpatrick 2013-06-22 01:49:22 +00:00 committed by Gerrit Code Review
parent f557a7235b a221ebe413
commit 268ba3aa8e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/osutil/paths.go
View File

@ -76,7 +76,10 @@ func CamliConfigDir() string {
if runtime.GOOS == "windows" { if runtime.GOOS == "windows" {
return filepath.Join(os.Getenv("APPDATA"), "Camlistore") return filepath.Join(os.Getenv("APPDATA"), "Camlistore")
} }
return filepath.Join(HomeDir(), ".camlistore") if xdg := os.Getenv("XDG_CONFIG_HOME"); xdg != "" {
return filepath.Join(xdg, "camlistore")
}
return filepath.Join(HomeDir(), ".config", "camlistore")
} }
func UserServerConfigPath() string { func UserServerConfigPath() string {
@ -84,7 +87,7 @@ func UserServerConfigPath() string {
} }
func UserClientConfigPath() string { func UserClientConfigPath() string {
return filepath.Join(CamliConfigDir(), "config") return filepath.Join(CamliConfigDir(), "client-config.json")
} }
func IdentitySecretRing() string { func IdentitySecretRing() string {