From 80254713cb9a74c7b2ca0870b881153b802e1c5d Mon Sep 17 00:00:00 2001 From: Oli Evans Date: Thu, 22 Oct 2020 20:35:50 +0100 Subject: [PATCH] fix: show subcommand info in short help if there are any - only invite the user to check help for subcommands if there are any - invite the user to check out the LongHelp for this command with --help License: MIT Signed-off-by: Oli Evans --- cli/helptext.go | 4 +++- cli/helptext_test.go | 3 --- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/cli/helptext.go b/cli/helptext.go index 5458bb2b..22230476 100644 --- a/cli/helptext.go +++ b/cli/helptext.go @@ -110,9 +110,11 @@ const shortHelpFormat = `USAGE {{end}}{{if .Subcommands}} SUBCOMMANDS {{.Subcommands}} -{{end}}{{if .MoreHelp}} {{.Indent}}For more information about each command, use: {{.Indent}}'{{.Path}} --help' +{{end}}{{if .MoreHelp}} +{{.Indent}}for more information about this command, use: +{{.Indent}}'{{.Path}} --help' {{end}} ` diff --git a/cli/helptext_test.go b/cli/helptext_test.go index 8210e83d..a9163dde 100644 --- a/cli/helptext_test.go +++ b/cli/helptext_test.go @@ -48,9 +48,6 @@ func TestSynopsisGenerator(t *testing.T) { if !strings.Contains(syn, "[--]") { t.Fatal("Synopsis should contain options finalizer") } - if strings.Contains(syn, "For more information about each command") { - t.Fatal("Synopsis should not contain subcommands") - } } func TestShortHelp(t *testing.T) {