Skip to content

System provided plugins release prep #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JonoYang merged 2 commits into from
Oct 31, 2024
Merged

System provided plugins release prep #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd3434c
Bump versions
JonoYang Oct 31, 2024
bd03684
Update code formatting
JonoYang Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion builtins/extractcode_7z_system_provided/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name='extractcode_7z_system_provided',
version='32.0.0',
version='33.0.0',
license='apache-2.0 AND lgpl-2.1 and unrar and brian-gladman-3-clause',
description=desc,
long_description=desc,
Expand Down
7 changes: 4 additions & 3 deletions builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ class SevenzipPaths(LocationProviderPlugin):

def get_like_distro(self):
info = platform.freedesktop_os_release()
ids = [info["ID"]]
if "ID_LIKE" in info:
ids = [info['ID']]
if 'ID_LIKE' in info:
# ids are space separated and ordered by precedence
ids.extend(info["ID_LIKE"].split())
ids.extend(info['ID_LIKE'].split())
return ids


Expand All @@ -46,6 +46,7 @@ def get_locations(self):
lib_dir = '/usr/bin'
lib_7z = path.join(lib_dir, '7z')
elif any(dist in rpm_based_distro for dist in distribution):
# 7zip proper is not available on dnf
lib_dir = '/usr/libexec/p7zip'
lib_7z = path.join(lib_dir, '7za')
else:
Expand Down
2 changes: 1 addition & 1 deletion builtins/extractcode_libarchive_system_provided/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name='extractcode_libarchive_system_provided',
version='32.0.0',
version='33.0.0',
license='apache-2.0 AND bsd-simplified',
description=desc,
long_description=desc,
Expand Down
12 changes: 8 additions & 4 deletions builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,16 @@ def get_locations(self):
rpm_based_distro = ['fedora', 'rhel']

if any(dist in debian_based_distro for dist in distribution):
db_dir = '/usr/lib/file'
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib/'+system_arch+'-linux-gnu'
lib_dir = (
'/usr/lib' if platform.architecture()[0] == '32bit'
else f'/usr/lib/{system_arch}-linux-gnu'
)

elif any(dist in rpm_based_distro for dist in distribution):
db_dir = '/usr/share/misc'
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64'
lib_dir = (
'/usr/lib' if platform.architecture()[0] == '32bit'
else '/usr/lib64'
)

else:
raise Exception(
Expand Down
2 changes: 1 addition & 1 deletion builtins/typecode_libmagic_system_provided/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

setup(
name='typecode_libmagic_system_provided',
version='32.0.0',
version='33.0.0',
license=(
'apache-2.0 AND bsd-simplified-darwin AND (bsd-simplified AND public-domain AND '
'bsd-new AND isc AND (bsd-new OR gpl-1.0-plus) AND bsd-original)'
Expand Down
18 changes: 12 additions & 6 deletions builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ class LibmagicPaths(LocationProviderPlugin):

def get_like_distro(self):
info = platform.freedesktop_os_release()
ids = [info["ID"]]
if "ID_LIKE" in info:
ids = [info['ID']]
if 'ID_LIKE' in info:
# ids are space separated and ordered by precedence
ids.extend(info["ID_LIKE"].split())
ids.extend(info['ID_LIKE'].split())
return ids

def get_locations(self):
Expand All @@ -53,11 +53,17 @@ def get_locations(self):

if any(dist in debian_based_distro for dist in distribution):
db_dir = '/usr/lib/file'
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib/'+system_arch+'-linux-gnu'
lib_dir = (
'/usr/lib' if platform.architecture()[0] == '32bit'
else f'/usr/lib/{system_arch}-linux-gnu'
)

elif any(dist in rpm_based_distro for dist in distribution):
db_dir = '/usr/share/misc'
lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64'
lib_dir = (
'/usr/lib' if platform.architecture()[0] == '32bit'
else '/usr/lib64'
)

else:
raise Exception('Unsupported system: {}'.format(distribution))
Expand Down Expand Up @@ -100,5 +106,5 @@ def get_locations(self):
'typecode.libmagic.libdir': lib_dir,
'typecode.libmagic.dll': dll_loc,
'typecode.libmagic.db': magicdb_loc,
}
}
return locations