Merge branch 'eclipseo-fix32bits'

Author: JonoYang

builtins/extractcode_libarchive_system_provided/src/extractcode_libarchive/__init__.py

@@ -42,11 +42,12 @@ def get_locations(self):
 
                 if any(dist in debian_based_distro for dist in distribution):
                     db_dir = '/usr/lib/file'
-                    lib_dir = '/usr/lib/'+system_arch+'-linux-gnu'
+                    lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/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/lib64'
+                    lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64'
+
                 else:
                     raise Exception(
                         'Unsupported system: {}'.format(distribution))

builtins/typecode_libmagic_system_provided/src/typecode_libmagic/__init__.py

@@ -52,11 +52,12 @@ def get_locations(self):
 
             if any(dist in debian_based_distro for dist in distribution):
                 db_dir = '/usr/lib/file'
-                lib_dir = '/usr/lib/'+system_arch+'-linux-gnu'
+                lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/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/lib64'
+                lib_dir = '/usr/lib' if platform.architecture()[0] == '32bit' else '/usr/lib64'
+
             else:
                 raise Exception('Unsupported system: {}'.format(distribution))