From d4dbb708320e59efa91b077303c87f9e9513cd91 Mon Sep 17 00:00:00 2001 From: Ahmet Alp Balkan Date: Tue, 21 Oct 2014 16:15:26 -0700 Subject: [PATCH] Use USERPROFILE path on Windows as home directory Signed-off-by: Ahmet Alp Balkan --- docker/flags.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/docker/flags.go b/docker/flags.go index 31dcbe2cff..1828c61d5e 100644 --- a/docker/flags.go +++ b/docker/flags.go @@ -4,6 +4,7 @@ import ( "fmt" "os" "path/filepath" + "runtime" "github.com/docker/docker/opts" flag "github.com/docker/docker/pkg/mflag" @@ -16,10 +17,17 @@ var ( func init() { if dockerCertPath == "" { - dockerCertPath = filepath.Join(os.Getenv("HOME"), ".docker") + dockerCertPath = filepath.Join(getHomeDir(), ".docker") } } +func getHomeDir() string { + if runtime.GOOS == "windows" { + return os.Getenv("USERPROFILE") + } + return os.Getenv("HOME") +} + var ( flVersion = flag.Bool([]string{"v", "-version"}, false, "Print version information and quit") flDaemon = flag.Bool([]string{"d", "-daemon"}, false, "Enable daemon mode")