diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-03-30 08:44:05 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-30 08:44:05 -0700 |
| commit | 833204d63bc01b52eed87b19911419169dfd97ad (patch) | |
| tree | f367c5bec5cea4db1ed0038c782ed69f595d84b8 | |
| parent | 7b7397481960c85379d8eb1ed21e76da2ce8a4fc (diff) | |
| parent | 33da2d489076038d0df0e881ac5f4306be2f4496 (diff) | |
| download | podman-833204d63bc01b52eed87b19911419169dfd97ad.tar.gz podman-833204d63bc01b52eed87b19911419169dfd97ad.tar.bz2 podman-833204d63bc01b52eed87b19911419169dfd97ad.zip | |
Merge pull request #2804 from rhatdan/help
Capitalize global options help information
| -rw-r--r-- | cmd/podman/main.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/podman/main.go b/cmd/podman/main.go index dd8b61408..1ea7f74bf 100644 --- a/cmd/podman/main.go +++ b/cmd/podman/main.go @@ -118,6 +118,9 @@ func init() { rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.CniConfigDir, "cni-config-dir", "", "Path of the configuration directory for CNI networks") rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.DefaultMountsFile, "default-mounts-file", "", "Path to default mounts file") rootCmd.PersistentFlags().MarkHidden("defaults-mount-file") + // Override default --help information of `--help` global flag + var dummyHelp bool + rootCmd.PersistentFlags().BoolVar(&dummyHelp, "help", false, "Help for podman") rootCmd.PersistentFlags().StringSliceVar(&MainGlobalOpts.HooksDir, "hooks-dir", []string{}, "Set the OCI hooks directory path (may be set multiple times)") rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.LogLevel, "log-level", "error", "Log messages above specified level: debug, info, warn, error, fatal or panic") rootCmd.PersistentFlags().IntVar(&MainGlobalOpts.MaxWorks, "max-workers", 0, "The maximum number of workers for parallel operations") @@ -132,7 +135,10 @@ func init() { rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Syslog, "syslog", false, "Output logging information to syslog as well as the console") rootCmd.PersistentFlags().StringVar(&MainGlobalOpts.TmpDir, "tmpdir", "", "Path to the tmp directory") - rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Trace, "trace", false, "enable opentracing output") + rootCmd.PersistentFlags().BoolVar(&MainGlobalOpts.Trace, "trace", false, "Enable opentracing output") + // Override default --help information of `--version` global flag + var dummyVersion bool + rootCmd.PersistentFlags().BoolVar(&dummyVersion, "version", false, "Version for podman") rootCmd.AddCommand(mainCommands...) rootCmd.AddCommand(getMainCommands()...) |