Merge commit '8ea10b8' into v3-porting

This commit is contained in:
Dan Buch 2022-11-07 08:29:57 -05:00
commit 2a68aa0894
Signed by: meatballhat
GPG Key ID: A12F782281063434

27
flag.go
View File

@ -5,6 +5,7 @@ import (
"flag" "flag"
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"os"
"regexp" "regexp"
"runtime" "runtime"
"strings" "strings"
@ -275,19 +276,23 @@ func prefixedNames(names []string, placeholder string) string {
return prefixed return prefixed
} }
func envFormat(envVars []string, prefix, sep, suffix string) string {
if len(envVars) > 0 {
return fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
}
return ""
}
func defaultEnvFormat(envVars []string) string {
return envFormat(envVars, "$", ", $", "")
}
func withEnvHint(envVars []string, str string) string { func withEnvHint(envVars []string, str string) string {
envText := "" envText := ""
if len(envVars) > 0 { if runtime.GOOS != "windows" || os.Getenv("PSHOME") != "" {
prefix := "$" envText = defaultEnvFormat(envVars)
suffix := "" } else {
sep := ", $" envText = envFormat(envVars, "%", "%, %", "%")
if runtime.GOOS == "windows" {
prefix = "%"
suffix = "%"
sep = "%, %"
}
envText = fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
} }
return str + envText return str + envText
} }