From 2bac71dc365dcac921961c736f854e9e74fcc5fc Mon Sep 17 00:00:00 2001 From: jebbs Date: Thu, 13 Oct 2022 14:33:14 +0800 Subject: [PATCH] update commands flags --- cmd/sing-box/cmd_format.go | 8 ++++---- cmd/sing-box/main.go | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cmd/sing-box/cmd_format.go b/cmd/sing-box/cmd_format.go index 5ef16042..acca9741 100644 --- a/cmd/sing-box/cmd_format.go +++ b/cmd/sing-box/cmd_format.go @@ -14,7 +14,7 @@ import ( ) var commandFormatWrite string -var commandEncodeFormat string +var commandFormatEncoding string var commandFormat = &cobra.Command{ Use: "format", @@ -29,8 +29,8 @@ var commandFormat = &cobra.Command{ } func init() { - commandFormat.Flags().StringVarP(&commandFormatWrite, "write", "w", "", "write result to (source) file instead of stdout") - commandFormat.Flags().StringVarP(&commandEncodeFormat, "encode", "e", string(mergers.FormatJSON), "encode format") + commandFormat.Flags().StringVarP(&commandFormatWrite, "write", "w", "", "write result to file instead of stdout") + commandFormat.Flags().StringVarP(&commandFormatEncoding, "format", "f", string(mergers.FormatJSON), "output format: json, yaml, toml") mainCommand.AddCommand(commandFormat) } @@ -40,7 +40,7 @@ func format() error { err error ) format := mergers.ParseFormat(configFormat) - encode := mergers.ParseFormat(commandEncodeFormat) + encode := mergers.ParseFormat(commandFormatEncoding) if encode == mergers.FormatAuto { encode = mergers.FormatJSON } diff --git a/cmd/sing-box/main.go b/cmd/sing-box/main.go index 8a42111a..e2a19276 100644 --- a/cmd/sing-box/main.go +++ b/cmd/sing-box/main.go @@ -24,9 +24,9 @@ var mainCommand = &cobra.Command{ } func init() { - mainCommand.PersistentFlags().StringArrayVarP(&configPaths, "config", "c", []string{"config.json"}, "set configuration file path") - mainCommand.PersistentFlags().StringVarP(&configFormat, "format", "", string(mergers.FormatAuto), "load configuration directories recursively") - mainCommand.PersistentFlags().BoolVarP(&configRecursive, "recursive", "r", false, "load configuration directories recursively") + mainCommand.PersistentFlags().StringArrayVarP(&configPaths, "config", "c", []string{"config.json"}, "set configuration files / directories") + mainCommand.PersistentFlags().StringVarP(&configFormat, "config-format", "", string(mergers.FormatAuto), "configuration files format: auto, json, jsonc, yaml, toml") + mainCommand.PersistentFlags().BoolVarP(&configRecursive, "config-recursive", "r", false, "load configuration directories recursively") mainCommand.PersistentFlags().StringVarP(&workingDir, "directory", "D", "", "set working directory") mainCommand.PersistentFlags().BoolVarP(&disableColor, "disable-color", "", false, "disable color output") }