From fe6af5f26335d3ba9c80df99306b9f9b52b22a14 Mon Sep 17 00:00:00 2001 From: Patrick Pacher Date: Thu, 16 Jul 2020 15:54:37 +0200 Subject: [PATCH] Fix linter warnings --- cmds/portmaster-start/run.go | 8 ++++---- cmds/portmaster-start/service_windows.go | 2 +- cmds/portmaster-start/show.go | 2 +- cmds/portmaster-start/version.go | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmds/portmaster-start/run.go b/cmds/portmaster-start/run.go index f01574d2..e9fa40f4 100644 --- a/cmds/portmaster-start/run.go +++ b/cmds/portmaster-start/run.go @@ -74,7 +74,7 @@ func registerComponent(opts []Options) { Use: opt.ShortIdentifier, Short: "Run the " + opt.Name, RunE: func(cmd *cobra.Command, args []string) error { - err := run(cmd, opt, args) + err := run(opt, args) initiateShutdown(err) return err }, @@ -86,7 +86,7 @@ func registerComponent(opts []Options) { Use: opt.ShortIdentifier, Short: "Show command to execute the " + opt.Name, RunE: func(cmd *cobra.Command, args []string) error { - return show(cmd, opt, args) + return show(opt, args) }, }, ) @@ -106,7 +106,7 @@ func getExecArgs(opts *Options, cmdArgs []string) []string { return args } -func run(cmd *cobra.Command, opts *Options, cmdArgs []string) (err error) { +func run(opts *Options, cmdArgs []string) (err error) { // set download option registry.Online = opts.AllowDownload @@ -230,7 +230,7 @@ func copyLogs(opts *Options, consoleSink io.Writer, version, ext string, logSour } if bytes, err := io.Copy(sink, logSource); err != nil { - log.Printf("%s: writting logs failed after %d bytes: %s", fileSink.Name(), bytes, err) + log.Printf("%s: writing logs failed after %d bytes: %s", fileSink.Name(), bytes, err) } } diff --git a/cmds/portmaster-start/service_windows.go b/cmds/portmaster-start/service_windows.go index d22dba18..598d478f 100644 --- a/cmds/portmaster-start/service_windows.go +++ b/cmds/portmaster-start/service_windows.go @@ -122,7 +122,7 @@ func runService(cmd *cobra.Command, opts *Options, cmdArgs []string) error { go func() { // run slightly delayed time.Sleep(250 * time.Millisecond) - err := run(cmd, opts, getExecArgs(opts, cmdArgs)) + err := run(opts, getExecArgs(opts, cmdArgs)) initiateShutdown(err) finishWg.Done() runWg.Done() diff --git a/cmds/portmaster-start/show.go b/cmds/portmaster-start/show.go index 0e3696c2..f7044d31 100644 --- a/cmds/portmaster-start/show.go +++ b/cmds/portmaster-start/show.go @@ -21,7 +21,7 @@ var showCmd = &cobra.Command{ Short: "Show the command to run a Portmaster component yourself", } -func show(cmd *cobra.Command, opts *Options, cmdArgs []string) error { +func show(opts *Options, cmdArgs []string) error { // get original arguments args := getExecArgs(opts, cmdArgs) diff --git a/cmds/portmaster-start/version.go b/cmds/portmaster-start/version.go index 2f80c77c..d2588a19 100644 --- a/cmds/portmaster-start/version.go +++ b/cmds/portmaster-start/version.go @@ -71,7 +71,7 @@ var versionCmd = &cobra.Command{ func init() { flags := versionCmd.Flags() { - flags.BoolVar(&showShortVersion, "short", false, "Print only the verison number.") + flags.BoolVar(&showShortVersion, "short", false, "Print only the version number.") flags.BoolVar(&showAllVersions, "all", false, "Dump versions for all components.") }