Browse Source
cmd: fmt: --write -> --overwrite to make it clear it's destructive
master
Matthew Holt
5 years ago
No known key found for this signature in database
GPG Key ID: 2A349DD577D586A5
2 changed files with
6 additions and
8 deletions
-
cmd/commandfuncs.go
-
cmd/commands.go
|
|
@ -514,14 +514,12 @@ func cmdValidateConfig(fl Flags) (int, error) { |
|
|
|
return caddy.ExitCodeSuccess, nil |
|
|
|
} |
|
|
|
|
|
|
|
func cmdFormatConfig(fl Flags) (int, error) { |
|
|
|
// Default path of file is Caddyfile
|
|
|
|
func cmdFmt(fl Flags) (int, error) { |
|
|
|
formatCmdConfigFile := fl.Arg(0) |
|
|
|
if formatCmdConfigFile == "" { |
|
|
|
formatCmdConfigFile = "Caddyfile" |
|
|
|
} |
|
|
|
|
|
|
|
formatCmdWriteFlag := fl.Bool("write") |
|
|
|
overwrite := fl.Bool("overwrite") |
|
|
|
|
|
|
|
input, err := ioutil.ReadFile(formatCmdConfigFile) |
|
|
|
if err != nil { |
|
|
@ -531,7 +529,7 @@ func cmdFormatConfig(fl Flags) (int, error) { |
|
|
|
|
|
|
|
output := caddyfile.Format(input) |
|
|
|
|
|
|
|
if formatCmdWriteFlag { |
|
|
|
if overwrite { |
|
|
|
err = ioutil.WriteFile(formatCmdConfigFile, output, 0644) |
|
|
|
if err != nil { |
|
|
|
return caddy.ExitCodeFailedStartup, nil |
|
|
|
|
|
@ -244,8 +244,8 @@ provisioning stages.`, |
|
|
|
|
|
|
|
RegisterCommand(Command{ |
|
|
|
Name: "fmt", |
|
|
|
Func: cmdFormatConfig, |
|
|
|
Usage: "[--write] [<path>]", |
|
|
|
Func: cmdFmt, |
|
|
|
Usage: "[--overwrite] [<path>]", |
|
|
|
Short: "Formats a Caddyfile", |
|
|
|
Long: ` |
|
|
|
Formats the Caddyfile by adding proper indentation and spaces to improve |
|
|
@ -255,7 +255,7 @@ If --write is specified, the output will be written to the config file |
|
|
|
directly instead of printing it.`, |
|
|
|
Flags: func() *flag.FlagSet { |
|
|
|
fs := flag.NewFlagSet("format", flag.ExitOnError) |
|
|
|
fs.Bool("write", false, "Over-write the output to specified file") |
|
|
|
fs.Bool("overwrite", false, "Overwrite the input file with the results") |
|
|
|
return fs |
|
|
|
}(), |
|
|
|
}) |
|
|
|