Infrastructure/caddy
1
Fork 0
mirror of https://github.com/caddyserver/caddy.git synced 2024-12-16 21:56:40 -05:00
Code Issues Activity

cmd: fmt exit successfully after overwriting config file (#5351)

Browse source 
Fixes https://github.com/caddyserver/caddy/issues/5349
This commit is contained in:
Amis Shokoohi 2023-01-31 19:54:44 +03:30 committed by GitHub
parent 201b9b41f9
commit 8c0b49bf03
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
cmd/commandfuncs.go
View file

@ -558,7 +558,10 @@ func cmdFmt(fl Flags) (int, error) {
if err := os.WriteFile(formatCmdConfigFile, output, 0600); err != nil { if err := os.WriteFile(formatCmdConfigFile, output, 0600); err != nil {
return caddy.ExitCodeFailedStartup, fmt.Errorf("overwriting formatted file: %v", err) return caddy.ExitCodeFailedStartup, fmt.Errorf("overwriting formatted file: %v", err)
} }
} else if fl.Bool("diff") { return caddy.ExitCodeSuccess, nil
}
if fl.Bool("diff") {
diff := difflib.Diff( diff := difflib.Diff(
strings.Split(string(input), "\n"), strings.Split(string(input), "\n"),
strings.Split(string(output), "\n")) strings.Split(string(output), "\n"))