From ffb4613221639b0daef5a1e1f519f7a678e9d676 Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Tue, 12 Jul 2022 09:50:21 -0600 Subject: [PATCH] installer.py: Avoid listing beta installers and warn 13.0 builds --- gui/gui_main.py | 11 +++++++++++ resources/installer.py | 5 +++++ 2 files changed, 16 insertions(+) diff --git a/gui/gui_main.py b/gui/gui_main.py index 249a751ae..51d6d98fe 100644 --- a/gui/gui_main.py +++ b/gui/gui_main.py @@ -1495,6 +1495,17 @@ class wx_python_gui: self.grab_installer_data(ias=ias) def download_macos_click(self, app_dict): + + try: + app_major = app_dict['Version'].split(".")[0] + if float(app_major) > self.constants.os_support: + # Throw pop up warning OCLP does not support this OS + dlg = wx.MessageDialog(self.frame_modal, f"OpenCore Legacy patcher currently does not support macOS {os_data.os_conversion.convert_kernel_to_marketing_name(os_data.os_conversion.os_to_kernel(app_major))}. We highly recommend you select and older installer.\n\nThe newest version we officially support is macOS {os_data.os_conversion.convert_kernel_to_marketing_name(os_data.os_conversion.os_to_kernel(str(self.constants.os_support)))}", "Unsupported OS", wx.YES_NO | wx.ICON_WARNING) + if dlg.ShowModal() == wx.ID_NO: + return + except ValueError: + pass + self.frame.DestroyChildren() installer_name = f"macOS {app_dict['Version']} ({app_dict['Build']})" diff --git a/resources/installer.py b/resources/installer.py index b6ec28cdb..7de40ffdd 100644 --- a/resources/installer.py +++ b/resources/installer.py @@ -207,6 +207,11 @@ def only_list_newest_installers(available_apps): # Now remove all versions that are not the largest for ia in list(available_apps): + if available_apps[ia]["Variant"] in ["DeveloperSeed", "PublicSeed"]: + # Remove Beta builds from default listing + available_apps.pop(ia) + continue + if available_apps[ia]["Version"].startswith(version): remote_version = available_apps[ia]["Version"].split(".") if remote_version[0] == "10":