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

getHookFiles: return error instead of panicking (MR 22)

Browse Source
This commit is contained in:
Clayton Craft
2022-09-09 22:00:28 -07:00
parent 029bdd849d
commit a4927a8915
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
main.go
View File

@@ -148,30 +148,30 @@ func exists(file string) bool {
return false return false
} }
func getHookFiles(filesdir string) misc.StringSet { func getHookFiles(filesdir string) (misc.StringSet, error) {
fileInfo, err := os.ReadDir(filesdir) fileInfo, err := os.ReadDir(filesdir)
if err != nil { if err != nil {
log.Fatal(err) return nil, err
} }
files := make(misc.StringSet) files := make(misc.StringSet)
for _, file := range fileInfo { for _, file := range fileInfo {
path := filepath.Join(filesdir, file.Name()) path := filepath.Join(filesdir, file.Name())
f, err := os.Open(path) f, err := os.Open(path)
if err != nil { if err != nil {
log.Fatal(err) return nil, err
} }
defer f.Close() defer f.Close()
s := bufio.NewScanner(f) s := bufio.NewScanner(f)
for s.Scan() { for s.Scan() {
if err := getFiles(files, misc.StringSet{s.Text(): true}, true); err != nil { if err := getFiles(files, misc.StringSet{s.Text(): true}, true); err != nil {
log.Fatalf("Unable to find file %q required by %q", s.Text(), path) return nil, fmt.Errorf("unable to find file %q required by %q", s.Text(), path)
} }
} }
if err := s.Err(); err != nil { if err := s.Err(); err != nil {
log.Fatal(err) return nil, err
} }
} }
return files return files, nil
} }
// Recursively list all dependencies for a given ELF binary // Recursively list all dependencies for a given ELF binary
@@ -429,7 +429,11 @@ func getInitfsExtraFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) er
// Hook files & scripts // Hook files & scripts
if exists("/etc/postmarketos-mkinitfs/files-extra") { if exists("/etc/postmarketos-mkinitfs/files-extra") {
log.Println("- Including hook files") log.Println("- Including hook files")
hookFiles := getHookFiles("/etc/postmarketos-mkinitfs/files-extra") var hookFiles misc.StringSet
hookFiles, err := getHookFiles("/etc/postmarketos-mkinitfs/files-extra")
if err != nil {
return err
}
if err := getFiles(files, hookFiles, true); err != nil { if err := getFiles(files, hookFiles, true); err != nil {
return err return err
} }
@@ -462,7 +466,10 @@ func getInitfsFiles(files misc.StringSet, devinfo deviceinfo.DeviceInfo) error {
// Hook files & scripts // Hook files & scripts
if exists("/etc/postmarketos-mkinitfs/files") { if exists("/etc/postmarketos-mkinitfs/files") {
log.Println("- Including hook files") log.Println("- Including hook files")
hookFiles := getHookFiles("/etc/postmarketos-mkinitfs/files") hookFiles, err := getHookFiles("/etc/postmarketos-mkinitfs/files")
if err != nil {
return err
}
if err := getFiles(files, hookFiles, true); err != nil { if err := getFiles(files, hookFiles, true); err != nil {
return err return err
} }