diff options
Diffstat (limited to 'config/config.go')
| -rw-r--r-- | config/config.go | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/config/config.go b/config/config.go index 092b73a6..1efbf896 100644 --- a/config/config.go +++ b/config/config.go @@ -77,18 +77,21 @@ func installTemplate(root, name string) error { return nil } -func LoadConfigFromFile(root *string, accts []string) error { +func LoadConfigFromFile( + root *string, accts []string, filename, bindPath, acctPath string, +) error { if root == nil { _root := xdg.ConfigPath("aerc") root = &_root } - filename := path.Join(*root, "aerc.conf") - - // if it doesn't exist copy over the template, then load - if _, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) { - fmt.Printf("%s not found, installing the system default\n", filename) - if err := installTemplate(*root, "aerc.conf"); err != nil { - return err + if filename == "" { + filename = path.Join(*root, "aerc.conf") + // if it doesn't exist copy over the template, then load + if _, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) { + fmt.Printf("%s not found, installing the system default\n", filename) + if err := installTemplate(*root, "aerc.conf"); err != nil { + return err + } } } @@ -129,10 +132,10 @@ func LoadConfigFromFile(root *string, accts []string) error { if err := parseTemplates(file); err != nil { return err } - if err := parseAccounts(*root, accts); err != nil { + if err := parseAccounts(*root, accts, acctPath); err != nil { return err } - if err := parseBinds(*root); err != nil { + if err := parseBinds(*root, bindPath); err != nil { return err } |