core/commands2: Added function to generate a 'commands' command for a root

core/commands2/commands.go

@@ -11,13 +11,16 @@ type Command struct {
 	Subcommands []Command
 }
 
-var commandsCmd = &cmds.Command{
+// CommandsCmd takes in a root command,
+// and returns a command that lists the subcommands in that root
+func CommandsCmd(root *cmds.Command) *cmds.Command {
+	return &cmds.Command{
 		Description: "List all available commands.",
 		Help: `Lists all available commands (and subcommands) and exits.
-`,
+	`,
 
 		Run: func(req cmds.Request) (interface{}, error) {
-		root := outputCommand("ipfs", Root)
+			root := outputCommand("ipfs", root)
 			return &root, nil
 		},
 		Marshallers: map[cmds.EncodingType]cmds.Marshaller{
@@ -28,6 +31,7 @@ var commandsCmd = &cmds.Command{
 			},
 		},
 		Type: &Command{},
+	}
 }
 
 func outputCommand(name string, cmd *cmds.Command) Command {

core/commands2/root.go

@@ -52,7 +52,7 @@ Plumbing commands:
 var rootSubcommands = map[string]*cmds.Command{
 	"cat":       catCmd,
 	"ls":        lsCmd,
-	"commands":  commandsCmd,
+	"commands":  CommandsCmd(Root),
 	"name":      nameCmd,
 	"add":       addCmd,
 	"log":       logCmd,