diff options
| author | Ed Santiago <santiago@redhat.com> | 2020-01-08 13:20:36 -0700 |
|---|---|---|
| committer | Ed Santiago <santiago@redhat.com> | 2020-01-08 14:24:43 -0700 |
| commit | 3b2aa033c8f6abdf93e25f9e7bed7dd596fcfe34 (patch) | |
| tree | e2eb3d04745cf31ef3d0c4b5a59fe382c8dcc333 /cmd/podman/common.go | |
| parent | c99b413abbc74f6f7e126d8bca58f44a3fcd9c2d (diff) | |
| download | podman-3b2aa033c8f6abdf93e25f9e7bed7dd596fcfe34.tar.gz podman-3b2aa033c8f6abdf93e25f9e7bed7dd596fcfe34.tar.bz2 podman-3b2aa033c8f6abdf93e25f9e7bed7dd596fcfe34.zip | |
Usage messages: show possible option values
...in a consistent manner: ("a"|"b"|"c")
This makes it possible (and easy) for zsh completion to
pick those out of the --help messages and offer them
as values when user hits TAB.
I chose this format because it's an already-existing
convention in cmd/podman/common.go.
Also: removed two duplicate "default: x" messages (Cobra
displays those automatically where a non-null default
is specified).
Signed-off-by: Ed Santiago <santiago@redhat.com>
Diffstat (limited to 'cmd/podman/common.go')
| -rw-r--r-- | cmd/podman/common.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/common.go b/cmd/podman/common.go index 69365201e..dc7590590 100644 --- a/cmd/podman/common.go +++ b/cmd/podman/common.go @@ -308,7 +308,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { ) createFlags.String( "image-volume", cliconfig.DefaultImageVolume, - "Tells podman how to handle the builtin image volumes. The options are: 'bind', 'tmpfs', or 'ignore'", + `Tells podman how to handle the builtin image volumes ("bind"|"tmpfs"|"ignore")`, ) createFlags.Bool( "init", false, @@ -431,7 +431,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { ) createFlags.String( "pull", "missing", - `Pull image before creating ("always"|"missing"|"never") (default "missing")`, + `Pull image before creating ("always"|"missing"|"never")`, ) createFlags.BoolP( "quiet", "q", false, @@ -447,7 +447,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { ) createFlags.String( "restart", "", - "Restart policy to apply when a container exits", + `Restart policy to apply when a container exits ("always"|"no"|"on-failure")`, ) createFlags.Bool( "rm", false, @@ -492,7 +492,7 @@ func getCreateFlags(c *cliconfig.PodmanCommand) { ) createFlags.String( "systemd", "true", - `Run container in systemd mode ("true"|"false"|"always" (default "true")`, + `Run container in systemd mode ("true"|"false"|"always")`, ) createFlags.StringArray( "tmpfs", []string{}, |