smallsolar/postmarketos-mkinitfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

hookscripts: glob hook directories

Browse Source
This commit is contained in:
Caleb Connolly
2023-04-07 01:13:15 +01:00
parent f0544999db
commit b54044a605
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/filelist/filelist.go
View File

@@ -51,7 +51,7 @@ func (f *FileList) Import(src *FileList) {
} }
} }
func (f *FileList) AddGlobbed(src string, dest string) (error) { func (f *FileList) AddGlobbed(src string, dest string) error {
fFiles, err := misc.GetFiles([]string{src}, true) fFiles, err := misc.GetFiles([]string{src}, true)
if err != nil { if err != nil {
return fmt.Errorf("unable to add %q: %w", src, err) return fmt.Errorf("unable to add %q: %w", src, err)

5
internal/filelist/hookscripts/hookscripts.go
View File

@@ -35,8 +35,13 @@ func (h *HookScripts) List() (*filelist.FileList, error) {
} }
for _, file := range fileInfo { for _, file := range fileInfo {
path := filepath.Join(h.scriptsDir, file.Name()) path := filepath.Join(h.scriptsDir, file.Name())
if file.IsDir() {
log.Printf("-- Including dir %s\n", path)
files.AddGlobbed(filepath.Join(path, "*"), filepath.Join(h.destPath, file.Name()))
} else {
log.Printf("-- Including script: %s\n", path) log.Printf("-- Including script: %s\n", path)
files.Add(path, filepath.Join(h.destPath, file.Name())) files.Add(path, filepath.Join(h.destPath, file.Name()))
} }
}
return files, nil return files, nil
} }