From c15abea64c20066fc0b4c328dfabd3e6ba3253a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6ran=20Karl?= <3951388+JoeKar@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:24:40 +0100 Subject: [PATCH] rtfiles: Give user defined runtime files precedence over asset files (#3066) --- internal/config/rtfiles.go | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/internal/config/rtfiles.go b/internal/config/rtfiles.go index b1d6de22..275831cf 100644 --- a/internal/config/rtfiles.go +++ b/internal/config/rtfiles.go @@ -129,9 +129,17 @@ func AddRuntimeFilesFromAssets(fileType RTFiletype, directory, pattern string) { if err != nil { return } + +assetLoop: for _, f := range files { if ok, _ := path.Match(pattern, f); ok { - AddRuntimeFile(fileType, assetFile(path.Join(directory, f))) + af := assetFile(path.Join(directory, f)) + for _, rf := range realFiles[fileType] { + if af.Name() == rf.Name() { + continue assetLoop + } + } + AddRuntimeFile(fileType, af) } } }