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

cmd/mkinitfs: use misc.GetFiles

Browse Source
This commit is contained in:
Clayton Craft
2023-02-17 13:23:12 -08:00
parent 93005527e0
commit d9b68843a3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/mkinitfs/main.go
View File

@@ -155,7 +155,7 @@ func getHookFiles(filesdir string) (files []string, err error) {
log.Printf("-- Including files from: %s\n", path) log.Printf("-- Including files from: %s\n", path)
s := bufio.NewScanner(f) s := bufio.NewScanner(f)
for s.Scan() { for s.Scan() {
if filelist, err := getFiles([]string{s.Text()}, true); err != nil { if filelist, err := misc.GetFiles([]string{s.Text()}, true); err != nil {
return nil, fmt.Errorf("getHookFiles: unable to add file %q required by %q: %w", s.Text(), path, err) return nil, fmt.Errorf("getHookFiles: unable to add file %q required by %q: %w", s.Text(), path, err)
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
@@ -347,7 +347,7 @@ func getInitfsExtraFiles(devinfo deviceinfo.DeviceInfo) (files []string, err err
"/usr/sbin/resize.f2fs", "/usr/sbin/resize.f2fs",
} }
log.Println("- Including extra binaries") log.Println("- Including extra binaries")
if filelist, err := getFiles(binariesExtra, true); err != nil { if filelist, err := misc.GetFiles(binariesExtra, true); err != nil {
return nil, err return nil, err
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)
@@ -423,7 +423,7 @@ func getInitfsFiles(devinfo deviceinfo.DeviceInfo) (files []string, err error) {
} }
log.Println("- Including required binaries") log.Println("- Including required binaries")
if filelist, err := getFiles(requiredFiles, true); err != nil { if filelist, err := misc.GetFiles(requiredFiles, true); err != nil {
return nil, err return nil, err
} else { } else {
files = append(files, filelist...) files = append(files, filelist...)