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

misc.Exists: bubble up any unexpected errors

Browse Source 
Fixes https://gitlab.com/postmarketOS/postmarketos-mkinitfs/-/issues/6
This commit is contained in:
Clayton Craft
2023-02-20 22:39:29 -08:00
parent d87a33a751
commit 06f86aadc9
4 changed files with 35 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
internal/filelist/osksdl/osksdl.go
View File

@@ -28,8 +28,11 @@ func New(mesaDriverName string) *OskSdl {
// disk (d)encryption
func (s *OskSdl) List() (*filelist.FileList, error) {
files := filelist.NewFileList()
if !misc.Exists("/usr/bin/osk-sdl") {
if exists, err := misc.Exists("/usr/bin/osk-sdl"); !exists {
return files, nil
} else if err != nil {
return files, fmt.Errorf("received unexpected error when getting status for %q: %w", "/usr/bin/osk-sdl", err)
}
log.Println("- Including osk-sdl support")
@@ -145,8 +148,10 @@ func getOskConfFontPath(oskConfPath string) (string, error) {
path = fields[2]
}
}
if !misc.Exists(path) {
if exists, err := misc.Exists(path); !exists {
return path, fmt.Errorf("unable to find font: %s", path)
} else if err != nil {
return path, fmt.Errorf("received unexpected error when getting status for %q: %w", path, err)
}
return path, nil