mirror of
https://github.com/dortania/OpenCore-Legacy-Patcher.git
synced 2026-06-18 21:30:00 +10:00
install.py: Avoid OC icon if Windows detected
This commit is contained in:
@@ -3,6 +3,7 @@
|
|||||||
## 0.4.8
|
## 0.4.8
|
||||||
- Ensure Apple Silicon-specific installers are not listed
|
- Ensure Apple Silicon-specific installers are not listed
|
||||||
- ie. M2 specific build (21F2092)
|
- ie. M2 specific build (21F2092)
|
||||||
|
- Avoid adding OpenCore icon in boot picker if Windows bootloader on same partition
|
||||||
|
|
||||||
## 0.4.7
|
## 0.4.7
|
||||||
- Fix crashing on defaults parsing
|
- Fix crashing on defaults parsing
|
||||||
|
|||||||
+15
-11
@@ -229,18 +229,22 @@ Please build OpenCore first!"""
|
|||||||
Path(mount_path / Path("EFI/BOOT")).mkdir()
|
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.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)
|
shutil.rmtree(mount_path / Path("System"), onerror=rmtree_handler)
|
||||||
if determine_sd_card(sd_type) is True:
|
# Due to how OpenCore processes on-volume icons, Windows may appear as OC's icon
|
||||||
print("- Adding SD Card icon")
|
if (mount_path / Path("EFI/Microsoft")).exists():
|
||||||
shutil.copy(self.constants.icon_path_sd, mount_path)
|
print("- Windows Boot Loader detected, skipping volume icon")
|
||||||
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:
|
else:
|
||||||
print("- Adding Internal Drive icon")
|
if determine_sd_card(sd_type) is True:
|
||||||
shutil.copy(self.constants.icon_path_internal, mount_path)
|
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("- Cleaning install location")
|
print("- Cleaning install location")
|
||||||
if not self.constants.recovery_status:
|
if not self.constants.recovery_status:
|
||||||
|
|||||||
Reference in New Issue
Block a user