Revert "Allow combining of short boolean options (e.g. crictl ps -aq)."

This reverts commit 8049711.

This has broken "crictl exec" arguments:

Mar 19 17:28:52 runcom.internal crio[25912]: time="2018-03-19
17:28:52.150599893+01:00" level=debug msg="ExecSyncRequest
&ExecSyncRequest{ContainerId:7520b,Cmd:[-c echo hello world
sh],Timeout:0,}"

You can see above the args are totally wrong. Not sure what caused this
but given the change wasn't _needed_ let's revert and make exec work
again. Tested successfully with CRI-O.

Signed-off-by: Antonio Murdaca <[email protected]>

Author: runcom

cmd/crictl/attach.go

@@ -31,10 +31,9 @@ import (
 )
 
 var runtimeAttachCommand = cli.Command{
-	Name:                   "attach",
-	Usage:                  "Attach to a running container",
-	ArgsUsage:              "CONTAINER",
-	UseShortOptionHandling: true,
+	Name:      "attach",
+	Usage:     "Attach to a running container",
+	ArgsUsage: "CONTAINER",
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "tty,t",

cmd/crictl/config.go

@@ -60,10 +60,9 @@ func writeConfig(c *Config, filepath string) error {
 }
 
 var configCommand = cli.Command{
-	Name:                   "config",
-	Usage:                  "Get and set crictl options",
-	ArgsUsage:              "[<options>]",
-	UseShortOptionHandling: true,
+	Name:      "config",
+	Usage:     "Get and set crictl options",
+	ArgsUsage: "[<options>]",
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "get",

cmd/crictl/container.go

@@ -102,10 +102,9 @@ var startContainerCommand = cli.Command{
 }
 
 var updateContainerCommand = cli.Command{
-	Name:                   "update",
-	Usage:                  "Update one or more running containers",
-	ArgsUsage:              "CONTAINER [CONTAINER...]",
-	UseShortOptionHandling: true,
+	Name:      "update",
+	Usage:     "Update one or more running containers",
+	ArgsUsage: "CONTAINER [CONTAINER...]",
 	Flags: []cli.Flag{
 		cli.Int64Flag{
 			Name:  "cpu-period",
@@ -166,10 +165,9 @@ var updateContainerCommand = cli.Command{
 }
 
 var stopContainerCommand = cli.Command{
-	Name:                   "stop",
-	Usage:                  "Stop one or more running containers",
-	ArgsUsage:              "CONTAINER [CONTAINER...]",
-	UseShortOptionHandling: true,
+	Name:      "stop",
+	Usage:     "Stop one or more running containers",
+	ArgsUsage: "CONTAINER [CONTAINER...]",
 	Flags: []cli.Flag{
 		cli.Int64Flag{
 			Name:  "timeout, t",
@@ -220,10 +218,9 @@ var removeContainerCommand = cli.Command{
 }
 
 var containerStatusCommand = cli.Command{
-	Name:                   "inspect",
-	Usage:                  "Display the status of one or more containers",
-	ArgsUsage:              "CONTAINER [CONTAINER...]",
-	UseShortOptionHandling: true,
+	Name:      "inspect",
+	Usage:     "Display the status of one or more containers",
+	ArgsUsage: "CONTAINER [CONTAINER...]",
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "output, o",
@@ -256,7 +253,6 @@ var containerStatusCommand = cli.Command{
 var listContainersCommand = cli.Command{
 	Name:  "ps",
 	Usage: "List containers",
-	UseShortOptionHandling: true,
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "verbose, v",

cmd/crictl/exec.go

@@ -36,10 +36,9 @@ const (
 )
 
 var runtimeExecCommand = cli.Command{
-	Name:                   "exec",
-	Usage:                  "Run a command in a running container",
-	ArgsUsage:              "CONTAINER COMMAND [ARG...]",
-	UseShortOptionHandling: true,
+	Name:      "exec",
+	Usage:     "Run a command in a running container",
+	ArgsUsage: "CONTAINER COMMAND [ARG...]",
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "sync, s",

cmd/crictl/image.go

@@ -48,7 +48,6 @@ func (a imageByRef) Less(i, j int) bool {
 var pullImageCommand = cli.Command{
 	Name:  "pull",
 	Usage: "Pull an image from a registry",
-	UseShortOptionHandling: true,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "creds",
@@ -86,10 +85,9 @@ var pullImageCommand = cli.Command{
 }
 
 var listImageCommand = cli.Command{
-	Name:                   "images",
-	Usage:                  "List images",
-	ArgsUsage:              "[REPOSITORY[:TAG]]",
-	UseShortOptionHandling: true,
+	Name:      "images",
+	Usage:     "List images",
+	ArgsUsage: "[REPOSITORY[:TAG]]",
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "verbose, v",
@@ -191,10 +189,9 @@ var listImageCommand = cli.Command{
 }
 
 var imageStatusCommand = cli.Command{
-	Name:                   "inspecti",
-	Usage:                  "Return the status of one ore more images",
-	ArgsUsage:              "IMAGEID [IMAGEID...]",
-	UseShortOptionHandling: true,
+	Name:      "inspecti",
+	Usage:     "Return the status of one ore more images",
+	ArgsUsage: "IMAGEID [IMAGEID...]",
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "output, o",

cmd/crictl/info.go

@@ -26,10 +26,9 @@ import (
 )
 
 var runtimeStatusCommand = cli.Command{
-	Name:                   "info",
-	Usage:                  "Display information of the container runtime",
-	ArgsUsage:              "",
-	UseShortOptionHandling: true,
+	Name:      "info",
+	Usage:     "Display information of the container runtime",
+	ArgsUsage: "",
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "output, o",

cmd/crictl/logs.go

@@ -29,10 +29,9 @@ import (
 )
 
 var logsCommand = cli.Command{
-	Name:                   "logs",
-	Usage:                  "Fetch the logs of a container",
-	ArgsUsage:              "CONTAINER",
-	UseShortOptionHandling: true,
+	Name:      "logs",
+	Usage:     "Fetch the logs of a container",
+	ArgsUsage: "CONTAINER",
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "follow, f",

cmd/crictl/sandbox.go

@@ -115,10 +115,9 @@ var removePodSandboxCommand = cli.Command{
 }
 
 var podSandboxStatusCommand = cli.Command{
-	Name:                   "inspectp",
-	Usage:                  "Display the status of one or more pod sandboxes",
-	ArgsUsage:              "PODSANDBOX [PODSANDBOX...]",
-	UseShortOptionHandling: true,
+	Name:      "inspectp",
+	Usage:     "Display the status of one or more pod sandboxes",
+	ArgsUsage: "PODSANDBOX [PODSANDBOX...]",
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "output, o",
@@ -151,7 +150,6 @@ var podSandboxStatusCommand = cli.Command{
 var listPodSandboxCommand = cli.Command{
 	Name:  "pods",
 	Usage: "List pod sandboxes",
-	UseShortOptionHandling: true,
 	Flags: []cli.Flag{
 		cli.StringFlag{
 			Name:  "id",

cmd/crictl/stats.go

@@ -50,7 +50,6 @@ var statsCommand = cli.Command{
 	Name: "stats",
 	// TODO(random-liu): Support live monitoring of resource usage.
 	Usage: "List container(s) resource usage statistics",
-	UseShortOptionHandling: true,
 	Flags: []cli.Flag{
 		cli.BoolFlag{
 			Name:  "all, a",

vendor.conf

@@ -13,7 +13,7 @@ github.com/onsi/gomega d59fa0ac68bb5dd932ee8d24eed631cdd519efc3
 github.com/opencontainers/selinux b29023b86e4a69d1b46b7e7b4e2b6fda03f0b9cd
 github.com/pborman/uuid ca53cad383cad2479bbba7f7a1a05797ec1386e4
 github.com/spf13/pflag 9ff6c6923cfffbcd502984b8e0c80539a94968b7
-github.com/urfave/cli 8e01ec4cd3e2d84ab2fe90d8210528ffbb06d8ff
+github.com/urfave/cli 7fb9c86b14e6a702a4157ccb5a863f07d844a207
 golang.org/x/crypto 81e90905daefcd6fd217b62423c0908922eadb30
 golang.org/x/net 1c05540f6879653db88113bc4a2b70aec4bd491f
 golang.org/x/sys 7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce