From 0ab150ba8948cf0b5c688384f5ac1bf234647f84 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 5 Aug 2019 14:36:57 +0200 Subject: [PATCH] Update control flags and usage message --- pmctl/main.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pmctl/main.go b/pmctl/main.go index 52d4651f..6d9c95f2 100644 --- a/pmctl/main.go +++ b/pmctl/main.go @@ -30,7 +30,7 @@ var ( rootCmd = &cobra.Command{ Use: "portmaster-control", - Short: "contoller for all portmaster components", + Short: "Controller for all portmaster components", PersistentPreRunE: cmdSetup, RunE: func(cmd *cobra.Command, args []string) error { if showShortVersion { @@ -43,6 +43,7 @@ var ( } return cmd.Help() }, + SilenceUsage: true, } ) @@ -52,6 +53,8 @@ func init() { rootCmd.PersistentFlags().StringVar(&dataDir, "data", "", "set data directory") rootCmd.PersistentFlags().StringVar(&databaseDir, "db", "", "alias to --data (deprecated)") + rootCmd.MarkPersistentFlagDirname("data") + rootCmd.MarkPersistentFlagDirname("db") rootCmd.Flags().BoolVar(&showFullVersion, "version", false, "print version") rootCmd.Flags().BoolVar(&showShortVersion, "ver", false, "print version number only") }