From 06ea0a52950ef6d1dd327c10e247ada1b71a5c5d Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 31 Dec 2019 18:31:43 -0700 Subject: Tune AppConfigDir and docs for Storage module --- storage.go | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'storage.go') diff --git a/storage.go b/storage.go index b7dcfe4..03f7691 100644 --- a/storage.go +++ b/storage.go @@ -84,14 +84,13 @@ func homeDirUnsafe() string { // // Ref: https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html func AppConfigDir() string { - basedir := os.Getenv("XDG_CONFIG_HOME") - if basedir == "" { - var err error - basedir, err = os.UserConfigDir() - if err != nil { - Log().Warn("unable to determine directory for user configuration; falling back to current directory", zap.Error(err)) - return "./caddy" - } + if basedir := os.Getenv("XDG_CONFIG_HOME"); basedir != "" { + return filepath.Join(basedir, "caddy") + } + basedir, err := os.UserConfigDir() + if err != nil { + Log().Warn("unable to determine directory for user configuration; falling back to current directory", zap.Error(err)) + return "./caddy" } subdir := "caddy" switch runtime.GOOS { -- cgit v1.2.3