From 08e0979cddb966c248c37a67fb5f78209ead7a22 Mon Sep 17 00:00:00 2001 From: Celestino Amoroso Date: Fri, 7 Jun 2024 09:01:18 +0200 Subject: [PATCH] import-utils.go: addPresetDirs() replaced by addSearchDirs() --- import-utils.go | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/import-utils.go b/import-utils.go index 14ce6a7..b1af7d0 100644 --- a/import-utils.go +++ b/import-utils.go @@ -32,6 +32,7 @@ func addEnvImportDirs(dirList []string) []string { return dirList } +/* func addPresetDirs(ctx ExprContext, ctrlKey string, dirList []string) []string { if dirSpec, exists := getControlString(ctx, ctrlKey); exists { dirs := strings.Split(dirSpec, ":") @@ -43,6 +44,25 @@ func addPresetDirs(ctx ExprContext, ctrlKey string, dirList []string) []string { } return dirList } +*/ + +func addSearchDirs(ctx ExprContext, endingPath string, dirList []string) []string { + if dirSpec, exists := getControlString(ctx, ControlSearchPath); exists { + dirs := strings.Split(dirSpec, ":") + if dirList == nil { + dirList = dirs + } else { + if len(endingPath) > 0 { + for _, d := range dirs { + dirList = append(dirList, path.Join(d, endingPath)) + } + } else { + dirList = append(dirList, dirs...) + } + } + } + return dirList +} func isFile(filePath string) bool { info, err := os.Stat(filePath)