From c125fe316658d63429b044b2251308b15bccd235 Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Mon, 9 Nov 2020 19:16:06 -0300 Subject: [PATCH] refactor: simplify for Signed-off-by: Carlos Alexandro Becker --- internal/extrafiles/extra_files.go | 31 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/internal/extrafiles/extra_files.go b/internal/extrafiles/extra_files.go index 883825c8225..5c5415e9b2b 100644 --- a/internal/extrafiles/extra_files.go +++ b/internal/extrafiles/extra_files.go @@ -14,23 +14,24 @@ import ( func Find(files []config.ExtraFile) (map[string]string, error) { var result = map[string]string{} for _, extra := range files { - if extra.Glob != "" { - files, err := zglob.Glob(extra.Glob) - if err != nil { - return result, fmt.Errorf("globbing failed for pattern %s: %w", extra.Glob, err) + if extra.Glob == "" { + continue + } + files, err := zglob.Glob(extra.Glob) + if err != nil { + return result, fmt.Errorf("globbing failed for pattern %s: %w", extra.Glob, err) + } + for _, file := range files { + info, err := os.Stat(file) + if err == nil && info.IsDir() { + log.Debugf("ignoring directory %s", file) + continue } - for _, file := range files { - info, err := os.Stat(file) - if err == nil && info.IsDir() { - log.Debugf("ignoring directory %s", file) - continue - } - var name = filepath.Base(file) - if old, ok := result[name]; ok { - log.Warnf("overriding %s with %s for name %s", old, file, name) - } - result[name] = file + var name = filepath.Base(file) + if old, ok := result[name]; ok { + log.Warnf("overriding %s with %s for name %s", old, file, name) } + result[name] = file } } return result, nil