Преглед изворни кода

Merge pull request #11316 from ahmetalpbalkan/win-cli/help-homepath-fix

Make use of %USERPROFILE% in cli help message
Tibor Vass пре 10 година
родитељ
комит
1a5e46ce89
1 измењених фајлова са 5 додато и 9 уклоњено
  1. 5 9
      pkg/mflag/flag.go

+ 5 - 9
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()
-
-		// Don't substitute when HOME is /
-		if home == "/" {
-			home = ""
-		}
+	home := homedir.Get()
+
+	// Don't substitute when HOME is /
+	if runtime.GOOS != "windows" && home == "/" {
+		home = ""
 	}
 	f.VisitAll(func(flag *Flag) {
 		format := "  -%s=%s"