Skip to content

Commit ceb4b56

Browse files
committed
Check for 7zip instead of p7zip
* We still have to use p7zip for Fedora because 7zip proper is not available on dnf Signed-off-by: Jono Yang <jyang@nexb.com>
1 parent 3a683f7 commit ceb4b56

1 file changed

Lines changed: 7 additions & 7 deletions

File tree

  • builtins/extractcode_7z_system_provided/src/extractcode_7z

builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ def get_locations(self):
4343
rpm_based_distro = ['fedora', 'rhel']
4444

4545
if any(dist in debian_based_distro for dist in distribution):
46-
lib_dir = '/usr/lib/p7zip'
47-
lib_7z = path.join(lib_dir, '7zr')
46+
lib_dir = '/usr/bin'
47+
lib_7z = path.join(lib_dir, '7z')
4848
elif any(dist in rpm_based_distro for dist in distribution):
4949
lib_dir = '/usr/libexec/p7zip'
5050
lib_7z = path.join(lib_dir, '7za')
@@ -55,17 +55,17 @@ def get_locations(self):
5555
lib_dir = '/usr/local/bin'
5656
lib_7z = path.join(lib_dir, '7z')
5757
elif mainstream_system == 'darwin':
58-
# This assumes that p7zip was installed using Homebrew
59-
lib_dir = '/opt/homebrew/lib/p7zip'
60-
lib_7z = path.join(lib_dir, '7z')
58+
# This assumes that 7zip was installed using Homebrew
59+
lib_dir = '/opt/homebrew/bin'
60+
lib_7z = path.join(lib_dir, '7zz')
6161
else:
6262
lib_dir = path.dirname(lib_7z)
6363

6464
# Check that path exist
6565
if not path.exists(lib_7z):
6666
raise Exception(
67-
'p7zip not found. Please refer to the scancode-toolkit '
68-
'documentation on how to install p7zip for your system.'
67+
'7zip not found. Please refer to the scancode-toolkit '
68+
'documentation on how to install 7zip for your system.'
6969
)
7070

7171
locations = {

0 commit comments

Comments
 (0)