diff --git a/scripts/download-macos-libs.py b/scripts/download-macos-libs.py index bd8f46f4bb9..73d83158b3b 100755 --- a/scripts/download-macos-libs.py +++ b/scripts/download-macos-libs.py @@ -47,8 +47,18 @@ def get_latest_pkg_filename_url(self, pkg_name): print(' [*] [DEBUG] url opened') pkgs = re.findall(pkg_name + r'[\w\.\-\_\+]*?\.' + self._darwin_target + r'\.' + self._arch + r'\.tbz2', pkg_list) print(f' [*] [DEBUG] len(pkgs) {len(pkgs)}') + + if len(pkgs) < 1: + pkgs = re.findall(pkg_name + r'[\w\.\-\_\+]*?\.' + r'darwin_any\.' + self._arch + r'\.tbz2', pkg_list) + + if len(pkgs) < 1: + pkgs = re.findall(pkg_name + r'[\w\.\-\_\+]*?\.' + self._darwin_target + r'\.noarch\.tbz2', pkg_list) + + if len(pkgs) < 1: + pkgs = re.findall(pkg_name + r'[\w\.\-\_\+]*?\.' + r'darwin_any\.noarch\.tbz2', pkg_list) + if len(pkgs) < 1: - print(f' [*] [ERROR] package {pkg_name} not found for arch {self._darwin_target}.{self._arch}') + print(f' [*] [ERROR] package {pkg_name} not found for arch {self._darwin_target}.{self._arch} or darwin_any.noarch') print(f' [*] [DEBUG] pkg_list: {pkg_list}') pkg_filename = pkgs[-1] print(' [*] [DEBUG] returning pkg_filename, pkg_url')