KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Output version information at bottom of help

Browse Source
This commit is contained in:
Kovid Goyal 2022-09-25 13:03:54 +05:30
parent 5771bd0c01
commit e608a945de
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/cli/help.go
View File

@ -25,9 +25,13 @@ func ShowError(err error) {
fmt.Fprintln(os.Stderr, formatter.Err("Error")+":", msg) fmt.Fprintln(os.Stderr, formatter.Err("Error")+":", msg)
} }
func (self *Command) version_string(formatter *markup.Context) string {
return fmt.Sprintln(formatter.Italic(self.CommandStringForUsage()), formatter.Opt(kitty.VersionString), "created by", formatter.Title("Kovid Goyal"))
}
func (self *Command) ShowVersion() { func (self *Command) ShowVersion() {
formatter := markup.New(tty.IsTerminal(os.Stdout.Fd())) formatter := markup.New(tty.IsTerminal(os.Stdout.Fd()))
fmt.Fprintln(os.Stdout, formatter.Italic(self.CommandStringForUsage()), formatter.Opt(kitty.VersionString), "created by", formatter.Title("Kovid Goyal")) fmt.Fprint(os.Stdout, self.version_string(formatter))
} }
func format_with_indent(output io.Writer, text string, indent string, screen_width int) { func format_with_indent(output io.Writer, text string, indent string, screen_width int) {
@ -112,7 +116,6 @@ func (self *Command) ShowHelp() {
} }
if self.HasVisibleSubCommands() { if self.HasVisibleSubCommands() {
fmt.Fprintln(&output)
self.FormatSubCommands(&output, formatter, screen_width) self.FormatSubCommands(&output, formatter, screen_width)
fmt.Fprintln(&output) fmt.Fprintln(&output)
format_with_indent(&output, "Get help for an individual command by running:", "", screen_width) format_with_indent(&output, "Get help for an individual command by running:", "", screen_width)
@ -134,6 +137,7 @@ func (self *Command) ShowHelp() {
} }
} }
} }
output.WriteString(self.version_string(formatter))
output_text := output.String() output_text := output.String()
// fmt.Printf("%#v\n", output_text) // fmt.Printf("%#v\n", output_text)
if formatter.EscapeCodesAllowed() { if formatter.EscapeCodesAllowed() {