core/commands2: Set root subcommands in init to prevent initialization loops

core/commands2/root.go

@@ -50,10 +50,14 @@ Plumbing commands:
 
 Use "ipfs help <command>" for more information about a command.
 `,
-	Subcommands: map[string]*cmds.Command{
+}
+
+var rootSubcommands = map[string]*cmds.Command{
 	"cat":      catCmd,
 	"ls":       lsCmd,
+	"commands": commandsCmd,
 	"init":     initCmd,
+	"daemon":   daemonCmd,
 
 	// test subcommands
 	// TODO: remove these when we don't need them anymore
@@ -105,10 +109,8 @@ Use "ipfs help <command>" for more information about a command.
 			res.SetValue(req.Stream())
 		},
 	},
-	},
 }
 
 func init() {
-	Root.Subcommands["daemon"] = daemonCmd
-	Root.Subcommands["commands"] = commandsCmd
+	Root.Subcommands = rootSubcommands
 }