Fix:(issue_1288). Add windows specific env format

flag.go

@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"regexp"
-	"runtime"
 	"strings"
 	"syscall"
 	"time"
@@ -268,21 +267,19 @@ func prefixedNames(names []string, placeholder string) string {
 	return prefixed
 }
 
-func withEnvHint(envVars []string, str string) string {
+func envFormat(envVars []string, prefix, sep, suffix string) string {
-	envText := ""
 	if len(envVars) > 0 {
-		prefix := "$"
+		return fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
-		suffix := ""
-		sep := ", $"
-		if runtime.GOOS == "windows" {
-			prefix = "%"
-			suffix = "%"
-			sep = "%, %"
 	}
+	return ""
+}
 
-		envText = fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
+func defaultEnvFormat(envVars []string) string {
-	}
+	return envFormat(envVars, "$", ", $", "")
-	return str + envText
+}
+
+func withEnvHint(envVars []string, str string) string {
+	return str + defaultEnvFormat(envVars)
 }
 
 func FlagNames(name string, aliases []string) []string {

flag_windows.go

@@ -0,0 +1,12 @@
+package cli
+
+func withEnvHint(envVars []string, str string) string {
+	// if we are running is powershell this env var is set
+	// and so we should use the default env format
+	if os.Getenv("PSHOME") != "" {
+		envText = defaultEnvFormat(envVars)
+	} else {
+		envText = envFormat(envVars, "%", "%, %", "%")
+	}
+	return str + envText
+}