Refactoring, and a usage tweak, for 2580

cmd/podman/common.go

@@ -67,6 +67,19 @@ func noSubArgs(c *cobra.Command, args []string) error {
 	return nil
 }
 
+/// badSubArg complains about unrecognized commands or subcommands
+func badSubArg(c *cobra.Command, args []string) error {
+	var msg string
+
+	if len(args) > 0 {
+		msg = fmt.Sprintf("unrecognized command `%s %s`", c.CommandPath(), args[0])
+	} else {
+		msg = fmt.Sprintf("`%s` requires a subcommand", c.CommandPath())
+	}
+
+	return errors.Errorf(msg + "\nTry '%s --help' for more information", c.CommandPath())
+}
+
 // getAllOrLatestContainers tries to return the correct list of containers
 // depending if --all, --latest or <container-id> is used.
 // It requires the Context (c) and the Runtime (runtime). As different
@@ -537,7 +550,7 @@ Description:
 // This blocks the desplaying of the global options. The main podman
 // command should not use this.
 func UsageTemplate() string {
-	return `Usage:{{if .Runnable}}
+	return `Usage:{{if (and .Runnable (not .HasAvailableSubCommands))}}
   {{.UseLine}}{{end}}{{if .HasAvailableSubCommands}}
   {{.CommandPath}} [command]{{end}}{{if gt (len .Aliases) 0}}
 

cmd/podman/container.go

@@ -15,6 +15,7 @@ var (
 			Short:            "Manage Containers",
 			Long:             containerDescription,
 			TraverseChildren: true,
+			RunE:             badSubArg,
 		},
 	}
 

cmd/podman/generate.go

@@ -12,6 +12,7 @@ var (
 		Use:   "generate",
 		Short: "Generated structured data",
 		Long:  generateDescription,
+		RunE:  badSubArg,
 	}
 )
 

cmd/podman/healthcheck.go

@@ -11,6 +11,7 @@ var healthcheckCommand = cliconfig.PodmanCommand{
 		Use:   "healthcheck",
 		Short: "Manage Healthcheck",
 		Long:  healthcheckDescription,
+		RunE:  badSubArg,
 	},
 }
 

cmd/podman/image.go

@@ -14,6 +14,7 @@ var (
 			Use:   "image",
 			Short: "Manage images",
 			Long:  imageDescription,
+			RunE:  badSubArg,
 		},
 	}
 	imagesSubCommand  cliconfig.ImagesValues

cmd/podman/main.go

@@ -82,9 +82,7 @@ var cmdsNotRequiringRootless = map[*cobra.Command]bool{
 var rootCmd = &cobra.Command{
 	Use:  "podman",
 	Long: "manage pods and images",
-	RunE: func(cmd *cobra.Command, args []string) error {
-		return cmd.Help()
-	},
+	RunE: badSubArg,
 	PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
 		return before(cmd, args)
 	},

cmd/podman/play.go

@@ -12,6 +12,7 @@ var (
 		Use:   "play",
 		Short: "Play a pod",
 		Long:  playDescription,
+		RunE:  badSubArg,
 	}
 )
 

cmd/podman/pod.go

@@ -13,6 +13,7 @@ var podCommand = cliconfig.PodmanCommand{
 		Use:   "pod",
 		Short: "Manage pods",
 		Long:  podDescription,
+		RunE:  badSubArg,
 	},
 }
 

cmd/podman/system.go

@@ -13,6 +13,7 @@ var (
 			Use:   "system",
 			Short: "Manage podman",
 			Long:  systemDescription,
+			RunE:  badSubArg,
 		},
 	}
 )

cmd/podman/trust.go

@@ -14,6 +14,7 @@ var (
 			Use:   "trust",
 			Short: "Manage container image trust policy",
 			Long:  trustDescription,
+			RunE:  badSubArg,
 		},
 	}
 )

cmd/podman/volume.go

@@ -12,6 +12,7 @@ var volumeCommand = cliconfig.PodmanCommand{
 		Use:   "volume",
 		Short: "Manage volumes",
 		Long:  volumeDescription,
+		RunE:  badSubArg,
 	},
 }
 var volumeSubcommands = []*cobra.Command{