mirror of https://github.com/docker/cli.git
Wrap output of docker cli --help
This should go some way to unblocking a solution to #18797, #18385 etc by removing the current rather restrictive constraints on help text length. Signed-off-by: Ian Campbell <ian.campbell@docker.com>
This commit is contained in:
parent
9f3d30afe3
commit
2469463a22
12
cobra.go
12
cobra.go
|
@ -4,6 +4,7 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"strings"
|
"strings"
|
||||||
|
|
||||||
|
"github.com/docker/docker/pkg/term"
|
||||||
"github.com/spf13/cobra"
|
"github.com/spf13/cobra"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -14,6 +15,7 @@ func SetupRootCommand(rootCmd *cobra.Command) {
|
||||||
cobra.AddTemplateFunc("hasManagementSubCommands", hasManagementSubCommands)
|
cobra.AddTemplateFunc("hasManagementSubCommands", hasManagementSubCommands)
|
||||||
cobra.AddTemplateFunc("operationSubCommands", operationSubCommands)
|
cobra.AddTemplateFunc("operationSubCommands", operationSubCommands)
|
||||||
cobra.AddTemplateFunc("managementSubCommands", managementSubCommands)
|
cobra.AddTemplateFunc("managementSubCommands", managementSubCommands)
|
||||||
|
cobra.AddTemplateFunc("wrappedFlagUsages", wrappedFlagUsages)
|
||||||
|
|
||||||
rootCmd.SetUsageTemplate(usageTemplate)
|
rootCmd.SetUsageTemplate(usageTemplate)
|
||||||
rootCmd.SetHelpTemplate(helpTemplate)
|
rootCmd.SetHelpTemplate(helpTemplate)
|
||||||
|
@ -76,6 +78,14 @@ func operationSubCommands(cmd *cobra.Command) []*cobra.Command {
|
||||||
return cmds
|
return cmds
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func wrappedFlagUsages(cmd *cobra.Command) string {
|
||||||
|
width := 80
|
||||||
|
if ws, err := term.GetWinsize(0); err == nil {
|
||||||
|
width = int(ws.Width)
|
||||||
|
}
|
||||||
|
return cmd.Flags().FlagUsagesWrapped(width - 1)
|
||||||
|
}
|
||||||
|
|
||||||
func managementSubCommands(cmd *cobra.Command) []*cobra.Command {
|
func managementSubCommands(cmd *cobra.Command) []*cobra.Command {
|
||||||
cmds := []*cobra.Command{}
|
cmds := []*cobra.Command{}
|
||||||
for _, sub := range cmd.Commands() {
|
for _, sub := range cmd.Commands() {
|
||||||
|
@ -108,7 +118,7 @@ Examples:
|
||||||
{{- if .HasFlags}}
|
{{- if .HasFlags}}
|
||||||
|
|
||||||
Options:
|
Options:
|
||||||
{{.Flags.FlagUsages | trimRightSpace}}
|
{{ wrappedFlagUsages . | trimRightSpace}}
|
||||||
|
|
||||||
{{- end}}
|
{{- end}}
|
||||||
{{- if hasManagementSubCommands . }}
|
{{- if hasManagementSubCommands . }}
|
||||||
|
|
Loading…
Reference in New Issue