The convert command has a new flag: config

🐛 Fix Fetch func cannot return err
🐛 Fix cannot read templates correctly
This commit is contained in:
2024-05-23 16:57:19 +08:00
parent 9789354a51
commit 8f6e39b634
7 changed files with 117 additions and 43 deletions

View File

@@ -176,8 +176,9 @@ func MergeTemplate(outbounds []model.Outbound, template string) (string, error)
}
} else {
if !strings.Contains(template, string(filepath.Separator)) {
if _, err := os.Stat(template); os.IsNotExist(err) {
template = filepath.Join("templates", template)
path := filepath.Join("templates", template)
if _, err := os.Stat(path); err == nil {
template = path
}
}
config, err = ReadTemplate(template)