From dbad5f86ec85334e4e33c31aa8639864fce3fbdc Mon Sep 17 00:00:00 2001 From: Lucas Garron Date: Fri, 6 Jul 2018 17:02:49 -0700 Subject: [PATCH] Use $XDG_DATA_HOME on macOS if it is set (#40) --- main.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index 25c7471..787cc24 100644 --- a/main.go +++ b/main.go @@ -140,6 +140,8 @@ func getCAROOT() string { switch runtime.GOOS { case "windows": dir = os.Getenv("LocalAppData") + case env = os.Getenv("XDG_DATA_HOME"); env != "": + dir = env case "darwin": dir = os.Getenv("HOME") if dir == "" { @@ -147,14 +149,11 @@ func getCAROOT() string { } dir = filepath.Join(dir, "Library", "Application Support") default: // Unix - dir = os.Getenv("XDG_DATA_HOME") + dir = os.Getenv("HOME") if dir == "" { - dir = os.Getenv("HOME") - if dir == "" { - return "" - } - dir = filepath.Join(dir, ".local", "share") + return "" } + dir = filepath.Join(dir, ".local", "share") } return filepath.Join(dir, "mkcert") }