fix(cli): fixed help formatting broken with recent upgrade to kingpin/v2 (kopia#2868)

Author: jkowalski

main.go

@@ -19,48 +19,48 @@ import (
 	"github.com/kopia/kopia/repo"
 )
 
-const usageTemplate = `{{define "FormatCommand"}}\
-{{if .FlagSummary}} {{.FlagSummary}}{{end}}\
-{{range .Args}} {{if not .Required}}[{{end}}<{{.Name}}>{{if .Value|IsCumulative}}...{{end}}{{if not .Required}}]{{end}}{{end}}\
-{{end}}\
-{{define "FormatCommandList"}}\
-{{range .}}\
-{{if not .Hidden}}\
-{{.Depth|Indent}}{{.Name}}{{if .Default}}*{{end}}{{template "FormatCommand" .}}
-{{template "FormatCommandList" .Commands}}\
-{{end}}\
-{{end}}\
-{{end}}\
-{{define "FormatUsage"}}\
-{{template "FormatCommand" .}}{{if .Commands}} <command> [<args> ...]{{end}}
+const usageTemplate = `{{define "FormatCommand" -}}
+{{if .FlagSummary}} {{.FlagSummary -}}{{end -}}
+{{range .Args}} {{if not .Required}}[{{end -}}<{{.Name -}}>{{if .Value|IsCumulative}}...{{end}}{{if not .Required}}]{{end}}{{end -}}
+{{end -}}
+{{define "FormatCommandList" -}}
+{{range . -}}
+{{if not .Hidden -}}
+{{.Depth|Indent -}}{{.Name -}}{{if .Default -}}*{{end -}}{{template "FormatCommand" .}}
+{{template "FormatCommandList" .Commands -}}
+{{end -}}
+{{end -}}
+{{end -}}
+{{define "FormatUsage" -}}
+{{template "FormatCommand" .}}{{if .Commands}} <command> [<args> ...]{{end -}}
 {{if .Help}}
-{{.Help|Wrap 0}}\
-{{end}}\
-{{end}}\
-{{if .Context.SelectedCommand}}\
+{{.Help|Wrap 0 -}}
+{{end -}}
+{{end}}
+{{if .Context.SelectedCommand -}}
 usage: {{.App.Name}} {{.Context.SelectedCommand}}{{template "FormatUsage" .Context.SelectedCommand}}
-{{else}}\
+{{else -}}
 usage: {{.App.Name}}{{template "FormatUsage" .App}}
-{{end}}\
-{{if .Context.Flags}}\
+{{end -}}
+{{if .Context.Flags -}}
 Flags:
 {{.Context.Flags|FlagsToTwoColumns|FormatTwoColumns}}
-{{end}}\
-{{if .Context.Args}}\
+{{end -}}
+{{if .Context.Args -}}
 Args:
 {{.Context.Args|ArgsToTwoColumns|FormatTwoColumns}}
-{{end}}\
-{{if .Context.SelectedCommand}}\
-{{if .Context.SelectedCommand.Commands}}\
+{{end -}}
+{{if .Context.SelectedCommand -}}
+{{if .Context.SelectedCommand.Commands -}}
 Subcommands:
   {{.Context.SelectedCommand}}
-{{template "FormatCommandList" .Context.SelectedCommand.Commands}}
-{{end}}\
-{{else if .App.Commands}}\
+{{template "FormatCommandList" .Context.SelectedCommand.Commands -}}
+{{end -}}
+{{else if .App.Commands -}}
 Commands (use --help-full to list all commands):
 
-{{template "FormatCommandList" .App.Commands}}
-{{end}}\
+{{template "FormatCommandList" .App.Commands -}}
+{{end -}}
 `
 
 func main() {