volker.raschek/dcmerge
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix(cmd): rename flag to last-win
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Markus Pesch 2023-07-26 10:28:08 +02:00
parent c50c0a835e
commit cadf25b089
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/root.go
View File

@ -42,7 +42,7 @@ dcmerge docker-compose.yml https://git.example.local/user/repo/docker-compose.ym
RunE: run, RunE: run,
Version: version, Version: version,
} }
rootCmd.Flags().BoolP("last-merge", "l", false, "Overwrite existing attributes") rootCmd.Flags().BoolP("last-win", "l", false, "Overwrite existing attributes")
rootCmd.Flags().BoolP("output-file", "o", false, "Write instead on stdout into a file") rootCmd.Flags().BoolP("output-file", "o", false, "Write instead on stdout into a file")
rootCmd.AddCommand(completionCmd) rootCmd.AddCommand(completionCmd)
@ -50,9 +50,9 @@ dcmerge docker-compose.yml https://git.example.local/user/repo/docker-compose.ym
} }
func run(cmd *cobra.Command, args []string) error { func run(cmd *cobra.Command, args []string) error {
mergeLastWin, err := cmd.Flags().GetBool("last-merge") mergeLastWin, err := cmd.Flags().GetBool("last-win")
if err != nil { if err != nil {
return fmt.Errorf("Failed to parse flag last-merge: %s", err) return fmt.Errorf("Failed to parse flag last-win: %s", err)
} }
outputFile, err := cmd.Flags().GetString("output-file") outputFile, err := cmd.Flags().GetString("output-file")