Remove flag_windows and use runtime

urfave · Oct 19, 2022 · 96bff3c · 96bff3c
1 parent 374bbfb
commit 96bff3c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/flag.go b/flag.go
@@ -5,7 +5,9 @@ import (
 	"flag"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"regexp"
+	"runtime"
 	"strings"
 	"syscall"
 	"time"
@@ -279,7 +281,13 @@ func defaultEnvFormat(envVars []string) string {
 }
 
 func withEnvHint(envVars []string, str string) string {
-	return str + defaultEnvFormat(envVars)
+	envText := ""
+	if runtime.GOOS != "windows" || os.Getenv("PSHOME") != "" {
+		envText = defaultEnvFormat(envVars)
+	} else {
+		envText = envFormat(envVars, "%", "%, %", "%")
+	}
+	return str + envText
 }
 
 func FlagNames(name string, aliases []string) []string {

diff --git a/flag_windows.go b/flag_windows.go