From ae475e709a3122508088e3823fc05a03ec4b1f39 Mon Sep 17 00:00:00 2001 From: termdisc Date: Fri, 13 Dec 2024 16:08:40 -0600 Subject: [PATCH] Add additional check for differently named Fedora-based distros (#780) Bazzite is Fedora-based but fails the `distro.id() == 'fedora'` check because `distro.id()` resolves to "bazzite." I added an additional check to include `distro.like() == 'fedora'` for situations like this. This needs to be formatted as an or statement because plain Fedora resolves `distro.like()` as a null string. --- kindlecomicconverter/comicarchive.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kindlecomicconverter/comicarchive.py b/kindlecomicconverter/comicarchive.py index 1fc678d..145f120 100644 --- a/kindlecomicconverter/comicarchive.py +++ b/kindlecomicconverter/comicarchive.py @@ -42,7 +42,7 @@ class ComicArchive: ['7z', 'l', '-y', '-p1', self.filepath], ] - if distro.id() == 'fedora': + if distro.id() == 'fedora' or distro.like() == 'fedora': extraction_commands.append( ['unrar', 'l', '-y', '-p1', self.filepath], ) @@ -76,7 +76,7 @@ class ComicArchive: ['unar', self.filepath, '-f', '-o', targetdir] ) - if distro.id() == 'fedora': + if distro.id() == 'fedora' or distro.like() == 'fedora': extraction_commands.append( ['unrar', 'x', '-y', '-x__MACOSX', '-x.DS_Store', '-xthumbs.db', '-xThumbs.db', self.filepath, targetdir] )