- Fixed issue with command description not being displayed if command…

… only has subcommands.

centry.go

@@ -75,7 +75,7 @@ func centry(osArgs []string) int {
 
 		Commands: map[string]cli.CommandFactory{},
 		Args:     args,
-		HelpFunc: centryHelpFunc(manifest.Config.Name, globalFlags), // TODO: Pass manifest instead of globalFlags to get correct flags order and short flags grouped with long option
+		HelpFunc: centryHelpFunc(manifest, globalFlags),
 
 		// Autocomplete:          true,
 		// AutocompleteInstall:   "install-autocomplete",

help.go

@@ -11,19 +11,19 @@ import (
 	"github.com/kristofferahl/cli"
 )
 
-func centryHelpFunc(app string, globalFlags *flag.FlagSet) cli.HelpFunc {
+func centryHelpFunc(manifest *manifest, globalFlags *flag.FlagSet) cli.HelpFunc {
 	return func(commands map[string]cli.CommandFactory) string {
 		var buf bytes.Buffer
-		buf.WriteString(fmt.Sprintf("Usage: %s [--version] [--help] <command> [<args>]\n\n", app))
+		buf.WriteString(fmt.Sprintf("Usage: %s [--version] [--help] <command> [<args>]\n\n", manifest.Config.Name))
 
-		writeCommands(&buf, commands)
+		writeCommands(&buf, commands, manifest)
 		writeOptions(&buf, globalFlags)
 
 		return buf.String()
 	}
 }
 
-func writeCommands(buf *bytes.Buffer, commands map[string]cli.CommandFactory) {
+func writeCommands(buf *bytes.Buffer, commands map[string]cli.CommandFactory, manifest *manifest) {
 	buf.WriteString("Available commands are:\n")
 
 	// Get the list of keys so we can sort them, and also get the maximum
@@ -53,8 +53,16 @@ func writeCommands(buf *bytes.Buffer, commands map[string]cli.CommandFactory) {
 			continue
 		}
 
+		synopsis := command.Synopsis()
+		if synopsis == "" {
+			for _, mc := range manifest.Commands {
+				if mc.Name == key {
+					synopsis = mc.Description
+				}
+			}
+		}
 		key = fmt.Sprintf("%s%s", key, strings.Repeat(" ", maxKeyLen-len(key)))
-		buf.WriteString(fmt.Sprintf("    %s    %s\n", key, command.Synopsis()))
+		buf.WriteString(fmt.Sprintf("    %s    %s\n", key, synopsis))
 	}
 }
 

test/data/commands/delete.sh

@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
 
-delete () {
-  echo "delete ($*)"
+delete:db () {
+  echo "delete:db ($*)"
+}
+
+delete:files () {
+  echo "delete:files ($*)"
 }