alihan/gotify-cli
1
0
Fork 0
mirror of https://github.com/gotify/cli.git synced 2024-01-28 15:20:39 +03:00
Code Issues Packages Projects Releases Wiki Activity

don't exit when current user is unknown (#14)

Browse Source
This commit is contained in:
饺子w
2019-03-29 09:36:22 +08:00
committed by GitHub
parent 439f43e91a
commit 4319a0aea4
1 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
config/locations.go
View File

@@ -4,25 +4,17 @@ import (
"os/user"
"path/filepath"
"runtime"
"github.com/gotify/cli/utils"
)
func userDir() string {
usr, err := user.Current()
if err != nil {
utils.Exit1With(err)
}
return usr.HomeDir
}
func GetLocations() (res []string) {
res = append(res, "./cli.json")
func GetLocations() []string {
inUserDir := filepath.Join(userDir(), ".gotify", "cli.json")
etcPath := "/etc/gotify/cli.json"
relativePath := "./cli.json"
if runtime.GOOS == "windows" {
return []string{relativePath, inUserDir}
} else {
return []string{relativePath, inUserDir, etcPath}
if usr, err := user.Current(); err != nil {
res = append(res, filepath.Join(usr.HomeDir, ".gotify", "cli.json"))
}
if runtime.GOOS != "windows" {
res = append(res, "/etc/gotify/cli.json")
}
return
}