From cb8496d6b278312495c14ffa4c4b74e976932f52 Mon Sep 17 00:00:00 2001 From: Garth Kidd Date: Sun, 17 Jan 2016 15:18:47 +1100 Subject: [PATCH] Ensure SEE ALSO list has no leading comma, fixing #229 --- doc/man_docs.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/man_docs.go b/doc/man_docs.go index f21d8395..a98674bf 100644 --- a/doc/man_docs.go +++ b/doc/man_docs.go @@ -188,10 +188,12 @@ func genMan(cmd *cobra.Command, header *GenManHeader) []byte { } if hasSeeAlso(cmd) { fmt.Fprintf(buf, "# SEE ALSO\n") + seealsos := make([]string, 0) if cmd.HasParent() { parentPath := cmd.Parent().CommandPath() dashParentPath := strings.Replace(parentPath, " ", "-", -1) - fmt.Fprintf(buf, "**%s(%s)**", dashParentPath, header.Section) + seealso := fmt.Sprintf("**%s(%s)**", dashParentPath, header.Section) + seealsos = append(seealsos, seealso) cmd.VisitParents(func(c *cobra.Command) { if c.DisableAutoGenTag { cmd.DisableAutoGenTag = c.DisableAutoGenTag @@ -200,16 +202,14 @@ func genMan(cmd *cobra.Command, header *GenManHeader) []byte { } children := cmd.Commands() sort.Sort(byName(children)) - for i, c := range children { + for _, c := range children { if !c.IsAvailableCommand() || c.IsHelpCommand() { continue } - if cmd.HasParent() || i > 0 { - fmt.Fprintf(buf, ", ") - } - fmt.Fprintf(buf, "**%s-%s(%s)**", dashCommandName, c.Name(), header.Section) + seealso := fmt.Sprintf("**%s-%s(%s)**", dashCommandName, c.Name(), header.Section) + seealsos = append(seealsos, seealso) } - fmt.Fprintf(buf, "\n") + fmt.Fprintf(buf, "%s\n", strings.Join(seealsos, ", ")) } if !cmd.DisableAutoGenTag { fmt.Fprintf(buf, "# HISTORY\n%s Auto generated by spf13/cobra\n", header.Date.Format("2-Jan-2006"))