From 2db8cb3a8556fac34833f7dbcff5ba066ba9149a Mon Sep 17 00:00:00 2001 From: Mykola Grymalyuk Date: Wed, 26 Oct 2022 06:56:33 -0600 Subject: [PATCH] install.py: Avoid drive icon confusion with OCLP --- docs/MONTEREY-DROP.md | 10 +++++----- docs/VENTURA-DROP.md | 2 +- resources/install.py | 26 +++++++++++--------------- 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/docs/MONTEREY-DROP.md b/docs/MONTEREY-DROP.md index 6d63c1657..e12c62bdb 100644 --- a/docs/MONTEREY-DROP.md +++ b/docs/MONTEREY-DROP.md @@ -1,7 +1,7 @@ ![](../images/macos-monterey.png) With OpenCore Legacy Patcher v0.1.7 and newer, we've implemented beta macOS Monterey support for users. Please note that Apple has dropped a lot of hardware with this release as well as broken many of our previous patch sets. This page will be used to inform users regarding current issues and will be updated as new patch sets are developed and added to our patcher. - + ## Newly dropped hardware With Monterey, Apple continues their their somewhat ruthless march of dropping Intel hardware. This release saw the removal, and thus addition into OpenCore Legacy Patcher, of the following models: @@ -29,7 +29,7 @@ With Monterey, Apple continues their their somewhat ruthless march of dropping I * MacBook Pro (Retina, 13-inch, Mid 2014) * MacBook Pro (Retina, 15-inch, Mid 2014) -::: +::: All of these models now have support in OpenCore Legacy Patcher. @@ -43,7 +43,7 @@ Due to the display being routed through the NVIDIA Kepler card and macOS being r ::: details iMac15,1 5K Display Output Issue (Resolved in 0.3.2 and newer) -* Documentation: +* Documentation: * [5K iMac and UEFI: Fixing the dreaded output limitation](https://khronokernel.github.io/macos/2021/12/08/5K-UEFI.html) * Associated Github Issue: * [5k Output issues on iMac15,1 (27" 5k iMac - 2014) #359](https://github.com/dortania/OpenCore-Legacy-Patcher/issues/359) @@ -79,7 +79,7 @@ The following models lost Wifi support in macOS Monterey due to their legacy Wir * MacBookPro6,x is exempt * MacPro5,1 and older -Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully support by OpenCore Legacy Patcher +Note: BCM943224, BCM94331, BCM94360 and BCM943602 are still fully supported by OpenCore Legacy Patcher ::: @@ -96,7 +96,7 @@ The following models lost Bluetooth support in macOS Monterey due to their legac * MacBookPro8,1 and older * MacPro5,1 and older -Note: Native BRCM20702 and BRCM20703 are still fully support by OpenCore Legacy Patcher +Note: Native BRCM20702 and BRCM20703 are still fully supported by OpenCore Legacy Patcher ::: details Dropped Firmwares diff --git a/docs/VENTURA-DROP.md b/docs/VENTURA-DROP.md index 717ba9b3c..05b5b3073 100644 --- a/docs/VENTURA-DROP.md +++ b/docs/VENTURA-DROP.md @@ -127,7 +127,7 @@ The following machines shipped stock with these cards: ::: -Currently BCM943224, BCM94331, BCM94360 and BCM943602 are still fully support by OpenCore Legacy Patcher. Consider upgrading to these cards if possible. +Currently BCM943224, BCM94331, BCM94360 and BCM943602 are still fully supported by OpenCore Legacy Patcher. Consider upgrading to these cards if possible. ### USB 1.1 (OHCI/UHCI) Support diff --git a/resources/install.py b/resources/install.py index 3a6da9a5d..1e90932cd 100644 --- a/resources/install.py +++ b/resources/install.py @@ -229,22 +229,18 @@ Please build OpenCore first!""" Path(mount_path / Path("EFI/BOOT")).mkdir() shutil.move(mount_path / Path("System/Library/CoreServices/boot.efi"), mount_path / Path("EFI/BOOT/BOOTx64.efi")) shutil.rmtree(mount_path / Path("System"), onerror=rmtree_handler) - # Due to how OpenCore processes on-volume icons, Windows may appear as OC's icon - if (mount_path / Path("EFI/Microsoft")).exists(): - print("- Windows Boot Loader detected, skipping volume icon") + if determine_sd_card(sd_type) is True: + print("- Adding SD Card icon") + shutil.copy(self.constants.icon_path_sd, mount_path) + elif ssd_type is True: + print("- Adding SSD icon") + shutil.copy(self.constants.icon_path_ssd, mount_path) + elif disk_type == "USB": + print("- Adding External USB Drive icon") + shutil.copy(self.constants.icon_path_external, mount_path) else: - if determine_sd_card(sd_type) is True: - print("- Adding SD Card icon") - shutil.copy(self.constants.icon_path_sd, mount_path) - elif ssd_type is True: - print("- Adding SSD icon") - shutil.copy(self.constants.icon_path_ssd, mount_path) - elif disk_type == "USB": - print("- Adding External USB Drive icon") - shutil.copy(self.constants.icon_path_external, mount_path) - else: - print("- Adding Internal Drive icon") - shutil.copy(self.constants.icon_path_internal, mount_path) + print("- Adding Internal Drive icon") + shutil.copy(self.constants.icon_path_internal, mount_path) print("- Cleaning install location") if not self.constants.recovery_status: