From 802c90500073ad79e5a6520402ef2a7268c824b7 Mon Sep 17 00:00:00 2001
From: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Date: Wed, 11 Mar 2015 02:14:49 -0700
Subject: [PATCH] Make use of %USERPROFILE% in cli help message

An earlier commit was causing docker windows CLI build to not to pick up
the shorthand form for home directory (`%USERPROFILE%`) shown in when
`docker --help` is executed.

Fixing that bug and making the if statement concise and clear.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
---
 pkg/mflag/flag.go | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/pkg/mflag/flag.go b/pkg/mflag/flag.go
index d02c7b1e01..b35692bfd3 100644
--- a/pkg/mflag/flag.go
+++ b/pkg/mflag/flag.go
@@ -506,15 +506,11 @@ func Set(name, value string) error {
 // otherwise, the default values of all defined flags in the set.
 func (f *FlagSet) PrintDefaults() {
 	writer := tabwriter.NewWriter(f.Out(), 20, 1, 3, ' ', 0)
-	var home string
-	if runtime.GOOS != "windows" {
-		// Only do this on non-windows systems
-		home = homedir.Get()
+	home := homedir.Get()
 
-		// Don't substitute when HOME is /
-		if home == "/" {
-			home = ""
-		}
+	// Don't substitute when HOME is /
+	if runtime.GOOS != "windows" && home == "/" {
+		home = ""
 	}
 	f.VisitAll(func(flag *Flag) {
 		format := "  -%s=%s"