diff options
| author | Ed Santiago <santiago@redhat.com> | 2019-02-28 07:29:33 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2019-02-28 13:11:14 -0700 |
| commit | 4258e3832627b23927f4a77dd85d1cb78f5a2a65 (patch) | |
| tree | fd05071722c2397a81e3164dd9b78b52d1d1848a /cmd/podman | |
| parent | 4a109a71996e99c9a95b639bbbee1c5e30450c97 (diff) | |
| download | podman-4258e3832627b23927f4a77dd85d1cb78f5a2a65.tar.gz podman-4258e3832627b23927f4a77dd85d1cb78f5a2a65.tar.bz2 podman-4258e3832627b23927f4a77dd85d1cb78f5a2a65.zip | |
Fix usage messages for podman image list, rm
pr #2480 fixed the missing 'podman image list/rm' commands;
it broke their usage messages. This corrects both usage
messages and also their examples.
Also: add an e2e test for 'podman image rm' (untested)
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/image.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cmd/podman/image.go b/cmd/podman/image.go index b5c1c3ccf..0777425eb 100644 --- a/cmd/podman/image.go +++ b/cmd/podman/image.go @@ -1,6 +1,8 @@ package main import ( + "strings" + "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/spf13/cobra" ) @@ -39,11 +41,13 @@ func init() { imageCommand.AddCommand(getImageSubCommands()...) // Setup of "images" to appear as "list" - _imagesSubCommand.Use = "list" + _imagesSubCommand.Use = strings.Replace(_imagesSubCommand.Use, "images", "list", 1) _imagesSubCommand.Aliases = []string{"ls"} + _imagesSubCommand.Example = strings.Replace(_imagesSubCommand.Example, "podman images", "podman image list", -1) imageCommand.AddCommand(&_imagesSubCommand) - // Setup of "rmi" to appears as "rm" - _rmSubCommand.Use = "rm" + // It makes no sense to keep 'podman images rmi'; just use 'rm' + _rmSubCommand.Use = strings.Replace(_rmSubCommand.Use, "rmi", "rm", 1) + _rmSubCommand.Example = strings.Replace(_rmSubCommand.Example, "podman rmi", "podman image rm", -1) imageCommand.AddCommand(&_rmSubCommand) } |