Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix:(issue_1288). Add windows specific env format #1538

Merged
merged 4 commits into from Oct 22, 2022
Merged

Fix:(issue_1288). Add windows specific env format #1538

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da8868f
Fix:(issue_1288). Add windows specific env format
dearchap Oct 18, 2022
f460fd1
Run goimports
dearchap Oct 18, 2022
374bbfb
Revert flag_test.go
dearchap Oct 19, 2022
96bff3c
Remove flag_windows and use runtime
dearchap Oct 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 16 additions & 11 deletions flag.go
View file
Open in desktop
Expand Up @@ -5,6 +5,7 @@ import (
"flag"
"fmt"
"io/ioutil"
"os"
"regexp"
"runtime"
"strings"
Expand Down Expand Up @@ -268,19 +269,23 @@ func prefixedNames(names []string, placeholder string) string {
return prefixed
}

func withEnvHint(envVars []string, str string) string {
envText := ""
func envFormat(envVars []string, prefix, sep, suffix string) string {
if len(envVars) > 0 {
prefix := "$"
suffix := ""
sep := ", $"
if runtime.GOOS == "windows" {
prefix = "%"
suffix = "%"
sep = "%, %"
}
return fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
}
return ""
}

envText = fmt.Sprintf(" [%s%s%s]", prefix, strings.Join(envVars, sep), suffix)
func defaultEnvFormat(envVars []string) string {
return envFormat(envVars, "$", ", $", "")
}

func withEnvHint(envVars []string, str string) string {
envText := ""
if runtime.GOOS != "windows" || os.Getenv("PSHOME") != "" {
envText = defaultEnvFormat(envVars)
} else {
envText = envFormat(envVars, "%", "%, %", "%")
}
return str + envText
}
Expand Down