Suppress arguments for windows snoretoast commands

pmctl/run.go

@@ -28,6 +28,7 @@ var (
 type Options struct {
 	Identifier        string // component identifier
 	ShortIdentifier   string // populated automatically
+	SuppressArgs      bool   // do not use any args
 	AllowDownload     bool   // allow download of component if it is not yet available
 	AllowHidingWindow bool   // allow hiding the window of the subprocess
 	NoOutput          bool   // do not use stdout/err if logging to file is available (did not fail to open log file)
@@ -134,6 +135,9 @@ func run(cmd *cobra.Command, opts *Options) (err error) {
 		return cmd.Help()
 	}
 	args = os.Args[3:]
+	if opts.SuppressArgs {
+		args = nil
+	}
 
 	// adapt identifier
 	if onWindows {

pmctl/show.go

@@ -53,7 +53,8 @@ var showNotifier = &cobra.Command{
 	Short: "Show command to run the Portmaster Notifier",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return show(cmd, &Options{
-			Identifier: "notifier/portmaster-notifier",
+			Identifier:   "notifier/portmaster-notifier",
+			SuppressArgs: true,
 		})
 	},
 	FParseErrWhitelist: cobra.FParseErrWhitelist{
@@ -69,6 +70,9 @@ func show(cmd *cobra.Command, opts *Options) error {
 		return cmd.Help()
 	}
 	args = os.Args[3:]
+	if opts.SuppressArgs {
+		args = nil
+	}
 
 	// adapt identifier
 	if onWindows {

pmctl/snoretoast_windows.go

@@ -12,7 +12,8 @@ var showSnoreToast = &cobra.Command{
 	Short: "Show command to run the Notifier component SnoreToast",
 	RunE: func(cmd *cobra.Command, args []string) error {
 		return show(cmd, &Options{
-			Identifier: "notifier/portmaster-snoretoast",
+			Identifier:   "notifier/portmaster-snoretoast",
+			SuppressArgs: true,
 		})
 	},
 	FParseErrWhitelist: cobra.FParseErrWhitelist{
@@ -29,6 +30,7 @@ var runSnoreToast = &cobra.Command{
 			Identifier:        "notifier/portmaster-snoretoast",
 			AllowDownload:     false,
 			AllowHidingWindow: true,
+			SuppressArgs:      true,
 		})
 	},
 	FParseErrWhitelist: cobra.FParseErrWhitelist{