From 77a2af8817284d134ea1f30f0b06291a5b05c5a0 Mon Sep 17 00:00:00 2001 From: Jhon Honce Date: Mon, 23 Mar 2020 10:27:32 -0700 Subject: Combine GlobalFlags and EngineFlags into EngineOptions * EngineOptions obtained in command via `opt, err := registry.Options(cmd)` Signed-off-by: Jhon Honce --- cmd/podmanV2/root.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cmd/podmanV2/root.go') diff --git a/cmd/podmanV2/root.go b/cmd/podmanV2/root.go index 2becd126d..68e8b4531 100644 --- a/cmd/podmanV2/root.go +++ b/cmd/podmanV2/root.go @@ -26,12 +26,13 @@ func init() { var dummyVersion bool // TODO had to disable shorthand -v for version due to -v rm with volume rootCmd.PersistentFlags().BoolVar(&dummyVersion, "version", false, "Version of Podman") - rootCmd.PersistentFlags().StringVarP(®istry.EngineOpts.Uri, "remote", "r", "", "URL to access Podman service") - rootCmd.PersistentFlags().StringSliceVar(®istry.EngineOpts.Identities, "identity", []string{}, "path to SSH identity file") + rootCmd.PersistentFlags().StringVarP(®istry.EngineOptions.Uri, "remote", "r", "", "URL to access Podman service") + rootCmd.PersistentFlags().StringSliceVar(®istry.EngineOptions.Identities, "identity", []string{}, "path to SSH identity file") } func Execute() { - if err := rootCmd.Execute(); err != nil { + o := registry.NewOptions(rootCmd.Context(), ®istry.EngineOptions) + if err := rootCmd.ExecuteContext(o); err != nil { fmt.Fprintln(os.Stderr, "Error:", err.Error()) } else if registry.GetExitCode() == define.ExecErrorCodeGeneric { // The exitCode modified from define.ExecErrorCodeGeneric, -- cgit v1.2.3-54-g00ecf