chunyu/sing-box
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-box.git synced 2025-06-13 21:54:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

update commands flags

Browse Source
This commit is contained in:
jebbs 2022-10-13 14:33:14 +08:00
parent 8145161f3c
commit 2bac71dc36
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/sing-box/cmd_format.go
View File

@ -14,7 +14,7 @@ import (
) )
var commandFormatWrite string var commandFormatWrite string
var commandEncodeFormat string var commandFormatEncoding string
var commandFormat = &cobra.Command{ var commandFormat = &cobra.Command{
Use: "format", Use: "format",
@ -29,8 +29,8 @@ var commandFormat = &cobra.Command{
} }
func init() { func init() {
commandFormat.Flags().StringVarP(&commandFormatWrite, "write", "w", "", "write result to (source) file instead of stdout") commandFormat.Flags().StringVarP(&commandFormatWrite, "write", "w", "", "write result to file instead of stdout")
commandFormat.Flags().StringVarP(&commandEncodeFormat, "encode", "e", string(mergers.FormatJSON), "encode format") commandFormat.Flags().StringVarP(&commandFormatEncoding, "format", "f", string(mergers.FormatJSON), "output format: json, yaml, toml")
mainCommand.AddCommand(commandFormat) mainCommand.AddCommand(commandFormat)
} }
@ -40,7 +40,7 @@ func format() error {
err error err error
) )
format := mergers.ParseFormat(configFormat) format := mergers.ParseFormat(configFormat)
encode := mergers.ParseFormat(commandEncodeFormat) encode := mergers.ParseFormat(commandFormatEncoding)
if encode == mergers.FormatAuto { if encode == mergers.FormatAuto {
encode = mergers.FormatJSON encode = mergers.FormatJSON
} }

6
cmd/sing-box/main.go
View File

@ -24,9 +24,9 @@ var mainCommand = &cobra.Command{
} }
func init() { func init() {
mainCommand.PersistentFlags().StringArrayVarP(&configPaths, "config", "c", []string{"config.json"}, "set configuration file path") mainCommand.PersistentFlags().StringArrayVarP(&configPaths, "config", "c", []string{"config.json"}, "set configuration files / directories")
mainCommand.PersistentFlags().StringVarP(&configFormat, "format", "", string(mergers.FormatAuto), "load configuration directories recursively") mainCommand.PersistentFlags().StringVarP(&configFormat, "config-format", "", string(mergers.FormatAuto), "configuration files format: auto, json, jsonc, yaml, toml")
mainCommand.PersistentFlags().BoolVarP(&configRecursive, "recursive", "r", false, "load configuration directories recursively") mainCommand.PersistentFlags().BoolVarP(&configRecursive, "config-recursive", "r", false, "load configuration directories recursively")
mainCommand.PersistentFlags().StringVarP(&workingDir, "directory", "D", "", "set working directory") mainCommand.PersistentFlags().StringVarP(&workingDir, "directory", "D", "", "set working directory")
mainCommand.PersistentFlags().BoolVarP(&disableColor, "disable-color", "", false, "disable color output") mainCommand.PersistentFlags().BoolVarP(&disableColor, "disable-color", "", false, "disable color output")
} }