kairos/luet
1
0
Fork 0
mirror of https://github.com/mudler/luet.git synced 2025-09-05 09:10:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

⚙️ Resolve templates folder when syncing repositories

Browse Source 
This fixes #284
This commit is contained in:
Ettore Di Giacinto
2022-01-09 11:58:13 +01:00
parent f8350a2f07
commit 4943ed6aef
6 changed files with 78 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
cmd/util/cli.go
View File

@@ -17,7 +17,6 @@ package util
import (
"os"
"path/filepath"
"strings"
"github.com/marcsauter/single"
@@ -26,6 +25,7 @@ import (
"github.com/spf13/viper"
"github.com/mudler/luet/pkg/api/core/context"
"github.com/mudler/luet/pkg/api/core/template"
"github.com/mudler/luet/pkg/api/core/types"
"github.com/mudler/luet/pkg/installer"
)
@@ -42,16 +42,15 @@ func ValuesFlags() []string {
}
// TemplateFolders returns the default folders which holds shared template between packages in a given tree path
func TemplateFolders(ctx *context.Context, fromRepo bool, treePaths []string) []string {
func TemplateFolders(ctx *context.Context, i installer.BuildTreeResult, treePaths []string) []string {
templateFolders := []string{}
for _, t := range treePaths {
templateFolders = append(templateFolders, filepath.Join(t, "templates"))
templateFolders = append(templateFolders, template.FindPossibleTemplatesDir(t)...)
}
if fromRepo {
for _, s := range installer.SystemRepositories(ctx.GetConfig().SystemRepositories) {
templateFolders = append(templateFolders, filepath.Join(s.TreePath, "templates"))
}
for _, r := range i.TemplatesDir {
templateFolders = append(templateFolders, r...)
}
return templateFolders
}