From 3642ce837f9307a6724d3fe863e6a55f2b3acf9b Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 23 Feb 2019 16:15:58 -0500 Subject: Fix play to show up in podman help Also change generate cli calls to match other commands. Signed-off-by: Daniel J Walsh --- cmd/podman/commands.go | 3 ++- cmd/podman/generate.go | 13 +++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/cmd/podman/commands.go b/cmd/podman/commands.go index d8fc44c2f..e3dc97573 100644 --- a/cmd/podman/commands.go +++ b/cmd/podman/commands.go @@ -16,8 +16,9 @@ func getMainCommands() []*cobra.Command { _createCommand, _diffCommand, _execCommand, - generateCommand.Command, + _generateCommand, _containerKubeCommand, + _playCommand, _psCommand, _loginCommand, _logoutCommand, diff --git a/cmd/podman/generate.go b/cmd/podman/generate.go index 66cb7a465..773d625ee 100644 --- a/cmd/podman/generate.go +++ b/cmd/podman/generate.go @@ -5,17 +5,18 @@ import ( "github.com/spf13/cobra" ) -var generateDescription = "Generate structured data based for a containers and pods" -var generateCommand = cliconfig.PodmanCommand{ - - Command: &cobra.Command{ +var ( + generateCommand cliconfig.PodmanCommand + generateDescription = "Generate structured data based for a containers and pods" + _generateCommand = &cobra.Command{ Use: "generate", Short: "Generated structured data", Long: generateDescription, - }, -} + } +) func init() { + generateCommand.Command = _generateCommand generateCommand.AddCommand(getGenerateSubCommands()...) generateCommand.SetUsageTemplate(UsageTemplate()) } -- cgit v1.2.3-54-g00ecf