Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3973 from thaJeztah/no_escape 

cli: additionalHelp() don't decorate output if it's piped, and add extra newline
This commit is contained in:
Sebastiaan van Stijn 2023-01-17 17:56:07 +01:00 committed by GitHub
parent 1493806509 9bb70217f8
commit fe694e8219
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cli/cobra.go
View File

@ -234,9 +234,13 @@ func isExperimental(cmd *cobra.Command) bool {
} }
func additionalHelp(cmd *cobra.Command) string { func additionalHelp(cmd *cobra.Command) string {
if additionalHelp, ok := cmd.Annotations["additionalHelp"]; ok { if msg, ok := cmd.Annotations["additionalHelp"]; ok {
out := cmd.OutOrStderr()
if _, isTerminal := term.GetFdInfo(out); !isTerminal {
return msg
}
style := aec.EmptyBuilder.Bold().ANSI style := aec.EmptyBuilder.Bold().ANSI
return style.Apply(additionalHelp) return style.Apply(msg)
} }
return "" return ""
} }
@ -507,6 +511,7 @@ Run '{{.CommandPath}} COMMAND --help' for more information on a command.
{{- if hasAdditionalHelp .}} {{- if hasAdditionalHelp .}}
{{ additionalHelp . }} {{ additionalHelp . }}
{{- end}} {{- end}}
` `