From c7910ce3db6bbb2bcd86a5bfbf0ff0b557928abf Mon Sep 17 00:00:00 2001 From: JoshVanL Date: Tue, 24 Mar 2020 08:46:33 +0000 Subject: [PATCH] Cleans up some code Signed-off-by: JoshVanL --- cmd/ctl/main.go | 2 +- cmd/ctl/pkg/version/version.go | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/cmd/ctl/main.go b/cmd/ctl/main.go index 90afe9e55..3e017c4ea 100644 --- a/cmd/ctl/main.go +++ b/cmd/ctl/main.go @@ -41,7 +41,7 @@ func main() { func SetupSignalHandler() (stopCh <-chan struct{}) { stop := make(chan struct{}) c := make(chan os.Signal, 2) - signal.Notify(c, []os.Signal{os.Interrupt, syscall.SIGTERM}...) + signal.Notify(c, os.Interrupt, syscall.SIGTERM) go func() { <-c close(stop) diff --git a/cmd/ctl/pkg/version/version.go b/cmd/ctl/pkg/version/version.go index 4c05c576f..d82f6634c 100644 --- a/cmd/ctl/pkg/version/version.go +++ b/cmd/ctl/pkg/version/version.go @@ -74,8 +74,6 @@ func (o *Options) Validate() error { // Run executes version command func (o *Options) Run() error { - var err error - versionInfo := util.VersionInfo() switch o.Output { @@ -103,5 +101,5 @@ func (o *Options) Run() error { return fmt.Errorf("VersionOptions were not validated: --output=%q should have been rejected", o.Output) } - return err + return nil }