From a22f00d4c58fdaba479405b38bac1508ef889c7e Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 22 Dec 2018 07:28:21 -0500 Subject: Allow alias for list, ls, ps to work Allow multiple alias for listing containers and images. Also fix documentation for umount and unmount Signed-off-by: Daniel J Walsh --- cmd/podman/container.go | 2 +- cmd/podman/images.go | 3 ++- cmd/podman/ps.go | 13 ++----------- 3 files changed, 5 insertions(+), 13 deletions(-) (limited to 'cmd') diff --git a/cmd/podman/container.go b/cmd/podman/container.go index b0232c874..4bb6f287a 100644 --- a/cmd/podman/container.go +++ b/cmd/podman/container.go @@ -18,7 +18,7 @@ var ( inspectCommand, killCommand, logsCommand, - lsCommand, + psCommand, mountCommand, pauseCommand, portCommand, diff --git a/cmd/podman/images.go b/cmd/podman/images.go index a1aeb6042..522863b1b 100644 --- a/cmd/podman/images.go +++ b/cmd/podman/images.go @@ -131,7 +131,8 @@ var ( OnUsageError: usageErrorHandler, } lsImagesCommand = cli.Command{ - Name: "ls", + Name: "list", + Aliases: []string{"ls"}, Usage: "list images in local storage", Description: imagesDescription, Flags: imagesFlags, diff --git a/cmd/podman/ps.go b/cmd/podman/ps.go index 7a4a80769..0ad3f4c73 100644 --- a/cmd/podman/ps.go +++ b/cmd/podman/ps.go @@ -207,7 +207,8 @@ var ( } psDescription = "Prints out information about the containers" psCommand = cli.Command{ - Name: "ps", + Name: "list", + Aliases: []string{"ls", "ps"}, Usage: "List containers", Description: psDescription, Flags: sortFlags(psFlags), @@ -216,16 +217,6 @@ var ( UseShortOptionHandling: true, OnUsageError: usageErrorHandler, } - lsCommand = cli.Command{ - Name: "ls", - Usage: "List containers", - Description: psDescription, - Flags: psFlags, - Action: psCmd, - ArgsUsage: "", - UseShortOptionHandling: true, - OnUsageError: usageErrorHandler, - } ) func psCmd(c *cli.Context) error { -- cgit v1.2.3-54-g00ecf