cupcakearmy/autorestic
1
0
Fork 0
mirror of https://github.com/cupcakearmy/autorestic.git synced 2026-04-02 20:05:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

dont duplicate global flags (#187)

Browse Source
This commit is contained in:
Nicco
2022-04-27 00:22:14 +02:00
committed by GitHub
parent 38e0f228d1
commit 1bb9973e90
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
internal/config.go
View File

@@ -295,12 +295,8 @@ func appendOptionsToSlice(str *[]string, options OptionMap) {
} }
} }
func getOptions(options Options, key string) []string { func getOptions(options Options, keys []string) []string {
var selected []string var selected []string
var keys = []string{"all"}
if key != "" {
keys = append(keys, key)
}
for _, key := range keys { for _, key := range keys {
appendOptionsToSlice(&selected, options[key]) appendOptionsToSlice(&selected, options[key])
} }
@@ -310,9 +306,9 @@ func getOptions(options Options, key string) []string {
func combineOptions(key string, l Location, b Backend) []string { func combineOptions(key string, l Location, b Backend) []string {
// Priority: location > backend > global // Priority: location > backend > global
var options []string var options []string
gFlags := getOptions(GetConfig().Global, key) gFlags := getOptions(GetConfig().Global, []string{key})
bFlags := getOptions(b.Options, key) bFlags := getOptions(b.Options, []string{"all", key})
lFlags := getOptions(l.Options, key) lFlags := getOptions(l.Options, []string{"all", key})
options = append(options, gFlags...) options = append(options, gFlags...)
options = append(options, bFlags...) options = append(options, bFlags...)
options = append(options, lFlags...) options = append(options, lFlags...)

2
internal/utils.go
View File

@@ -81,7 +81,7 @@ func ExecuteCommand(options ExecuteOptions, args ...string) (int, string, error)
func ExecuteResticCommand(options ExecuteOptions, args ...string) (int, string, error) { func ExecuteResticCommand(options ExecuteOptions, args ...string) (int, string, error) {
options.Command = RESTIC_BIN options.Command = RESTIC_BIN
var c = GetConfig() var c = GetConfig()
var optionsAsString = getOptions(c.Global, "") var optionsAsString = getOptions(c.Global, []string{"all"})
args = append(optionsAsString, args...) args = append(optionsAsString, args...)
return ExecuteCommand(options, args...) return ExecuteCommand(options, args...)
} }