Merge branch 'eclipseo-fix_detect_linux'

Author: JonoYang

builtins/extractcode_7z_system_provided/src/extractcode_7z/__init__.py

@@ -17,6 +17,15 @@
 
 class SevenzipPaths(LocationProviderPlugin):
 
+    def get_like_distro(self):
+        info = platform.freedesktop_os_release()
+        ids = [info["ID"]]
+        if "ID_LIKE" in info:
+            # ids are space separated and ordered by precedence
+            ids.extend(info["ID_LIKE"].split())
+        return ids
+
+
     def get_locations(self):
         """
         Return a mapping of {location key: location} providing the installation
@@ -29,14 +38,14 @@ def get_locations(self):
             mainstream_system = platform.system().lower()
 
             if mainstream_system == 'linux':
-                distribution = platform.linux_distribution()[0].lower()
+                distribution = self.get_like_distro()
                 debian_based_distro = ['ubuntu', 'mint', 'debian']
-                rpm_based_distro = ['fedora', 'redhat']
+                rpm_based_distro = ['fedora', 'rhel']
 
-                if distribution in debian_based_distro:
+                if any(dist in debian_based_distro for dist in distribution):
                     lib_dir = '/usr/lib/p7zip'
                     lib_7z = path.join(lib_dir, '7zr')
-                elif distribution in rpm_based_distro:
+                elif any(dist in rpm_based_distro for dist in distribution):
                     lib_dir = '/usr/libexec/p7zip'
                     lib_7z = path.join(lib_dir, '7za')
                 else:

builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py

@@ -15,6 +15,15 @@
 
 
 class LibarchivePaths(LocationProviderPlugin):
+
+    def get_like_distro(self):
+        info = platform.freedesktop_os_release()
+        ids = [info["ID"]]
+        if "ID_LIKE" in info:
+            # ids are space separated and ordered by precedence
+            ids.extend(info["ID_LIKE"].split())
+        return ids
+
     def get_locations(self):
         """
         Return a mapping of {location key: location} providing the installation
@@ -27,13 +36,16 @@ def get_locations(self):
             mainstream_system = platform.system().lower()
 
             if mainstream_system == 'linux':
-                distribution = platform.linux_distribution()[0].lower()
+                distribution = self.get_like_distro()
                 debian_based_distro = ['ubuntu', 'mint', 'debian']
-                rpm_based_distro = ['fedora', 'redhat']
+                rpm_based_distro = ['fedora', 'rhel']
 
-                if distribution in debian_based_distro:
+                if any(dist in debian_based_distro for dist in distribution):
+                    db_dir = '/usr/lib/file'
                     lib_dir = '/usr/lib/'+system_arch+'-linux-gnu'
-                elif distribution in rpm_based_distro:
+
+                elif any(dist in rpm_based_distro for dist in distribution):
+                    db_dir = '/usr/share/misc'
                     lib_dir = '/usr/lib64'
                 else:
                     raise Exception(

builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py

@@ -29,6 +29,15 @@
 
 
 class LibmagicPaths(LocationProviderPlugin):
+
+    def get_like_distro(self):
+        info = platform.freedesktop_os_release()
+        ids = [info["ID"]]
+        if "ID_LIKE" in info:
+            # ids are space separated and ordered by precedence
+            ids.extend(info["ID_LIKE"].split())
+        return ids
+
     def get_locations(self):
         """
         Return a mapping of {location key: location} providing the installation
@@ -37,15 +46,15 @@ def get_locations(self):
         """
         mainstream_system = platform.system().lower()
         if mainstream_system == 'linux':
-            system_arch = platform.machine()
-            distribution = platform.linux_distribution()[0].lower()
+            distribution = self.get_like_distro()
             debian_based_distro = ['ubuntu', 'mint', 'debian']
-            rpm_based_distro = ['fedora', 'redhat']
+            rpm_based_distro = ['fedora', 'rhel']
 
-            if distribution in debian_based_distro:
+            if any(dist in debian_based_distro for dist in distribution):
                 db_dir = '/usr/lib/file'
                 lib_dir = '/usr/lib/'+system_arch+'-linux-gnu'
-            elif distribution in rpm_based_distro:
+
+            elif any(dist in rpm_based_distro for dist in distribution):
                 db_dir = '/usr/share/misc'
                 lib_dir = '/usr/lib64'
             else: