New scripts, updated current scripts, new repo license

Added Dell PFS BIOS Extractor v3.0 (removed Dell HDR Module Extractor v2.0)

Added Apple EFI Package Extractor v1.1

Apple EFI File Renamer v1.3 supports calling from Apple EFI Package Extractor utility

Apple EFI IM4P Splitter v1.3 supports calling from Apple EFI Package Extractor utility

Apple EFI Sucatalog Link Grabber v1.2 stores output text file with unique name for easier comparisons

Repository is now licensed under BSD+Patent

All scripts now require Python 3.7 or newer

Author: platomav

Apple EFI File Renamer/Apple_EFI_Rename.py

@@ -3,11 +3,11 @@
 """
 Apple EFI Rename
 Apple EFI File Renamer
-Copyright (C) 2018 Plato Mavropoulos
+Copyright (C) 2018-2019 Plato Mavropoulos
 https://github.com/tianocore/edk2/blob/master/Vlv2TbltDevicePkg/Include/Library/BiosIdLib.h
 """
 
-print('Apple EFI File Renamer v1.2\n')
+print('Apple EFI File Renamer v1.3\n')
 
 import os
 import re
@@ -18,12 +18,18 @@
 
 pattern = re.compile(br'\x24\x49\x42\x49\x4F\x53\x49\x24') # Intel $IBIOSI$
 
-if len(sys.argv) >= 2 :
+if len(sys.argv) >= 3 and sys.argv[1] == '-skip' :
+	# Called via Apple_EFI_Package
+	apple_efi = sys.argv[2:]
+	skip_pause = True
+elif len(sys.argv) >= 2 :
 	# Drag & Drop or CLI
 	apple_efi = sys.argv[1:]
+	skip_pause = False
 else :
 	# Folder path
 	apple_efi = []
+	skip_pause = False
 	in_path = input('\nEnter the full folder path: ')
 	print('\nWorking...\n')
 	for root, dirs, files in os.walk(in_path):
@@ -95,4 +101,4 @@
 		print('\nError: Could not find $IBIOSI$ pattern at %s!' % file_name)
 		print('       Make sure that "UEFIFind" and "UEFIExtract" executables exist!\n')
 
-input('Done!')
+if not skip_pause : input('Done!')

Apple EFI IM4P Splitter/Apple_EFI_Split.py

@@ -3,10 +3,10 @@
 """
 Apple EFI Split
 Apple EFI IM4P Splitter
-Copyright (C) 2018 Plato Mavropoulos
+Copyright (C) 2018-2019 Plato Mavropoulos
 """
 
-print('Apple EFI IM4P Splitter v1.2')
+print('Apple EFI IM4P Splitter v1.3')
 
 import os
 import re
@@ -15,12 +15,19 @@
 im4p = re.compile(br'\x16\x04\x49\x4D\x34\x50\x16\x04') # Apple IM4P
 ifd = re.compile(br'\x5A\xA5\xF0\x0F.{172}\xFF{16}', re.DOTALL) # Intel Flash Descriptor
 
-if len(sys.argv) >= 2 :
+# Get input catalog file paths
+if len(sys.argv) >= 3 and sys.argv[1] == '-skip' :
+	# Called via Apple_EFI_Package
+	apple_im4p = sys.argv[2:]
+	skip_pause = True
+elif len(sys.argv) >= 2 :
 	# Drag & Drop or CLI
 	apple_im4p = sys.argv[1:]
+	skip_pause = False
 else :
 	# Folder path
 	apple_im4p = []
+	skip_pause = False
 	in_path = input('\nEnter the full folder path: ')
 	print('\nWorking...')
 	for root, dirs, files in os.walk(in_path):
@@ -73,4 +80,6 @@
 
 		spi_start += spi_size
 
-input('\nDone!')
+	print('\n    Split IM4P file into %d SPI/BIOS image(s)!' % len(ifd_count))
+		
+if not skip_pause : input('\nDone!')

Apple EFI Package Extractor/Apple_EFI_Package.py

@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+
+"""
+Apple EFI Package
+Apple EFI Package Extractor
+Copyright (C) 2019 Plato Mavropoulos
+"""
+
+print('Apple EFI Package Extractor v1.1')
+
+import os
+import sys
+import zlib
+import shutil
+import subprocess
+
+if len(sys.argv) >= 2 :
+	pkg = sys.argv[1:]
+else :
+	pkg = []
+	in_path = input('\nEnter the full folder path: ')
+	print('\nWorking...')
+	for root, dirs, files in os.walk(in_path):
+		for name in files :
+			pkg.append(os.path.join(root, name))
+
+anytoiso_path = 'C:\\Program Files (x86)\\AnyToISO\\anytoiso.exe'
+			
+final_path = os.path.join(os.getcwd(), 'AppleEFI')
+if os.path.exists(final_path) : shutil.rmtree(final_path)
+			
+for input_file in pkg :
+	file_path = os.path.abspath(input_file)
+	file_name = os.path.basename(input_file)
+	file_dir = os.path.dirname(file_path)
+	file_ext = os.path.splitext(file_path)[1]
+	
+	print('\nFile: %s\n' % file_name)
+	
+	with open(input_file, 'rb') as in_buff : file_adler = zlib.adler32(in_buff.read()) & 0xFFFFFFFF
+	
+	pkg_payload = os.path.join(final_path, '%s_%0.8X' % (file_name, file_adler))
+	pkg_temp = os.path.join(final_path, '__TEMP_%s_%0.8X' % (file_name, file_adler))
+	os.makedirs(pkg_temp)
+	
+	subprocess.run([anytoiso_path, '/extract', file_path, pkg_temp], check = True, stdout=subprocess.DEVNULL)
+		
+	if os.path.isfile(os.path.join(pkg_temp, 'Scripts')) :
+		scripts_init = os.path.join(pkg_temp, 'Scripts')
+		scripts_cpgz = os.path.join(pkg_temp, 'Scripts.cpgz')
+		scripts_extr = os.path.join(pkg_temp, 'Scripts', '')
+		efi_path = os.path.join(scripts_extr, 'Tools', 'EFIPayloads', '')
+		
+		os.replace(scripts_init, scripts_cpgz)
+		
+		subprocess.run([anytoiso_path, '/extract', scripts_cpgz, scripts_extr], check = True, stdout=subprocess.DEVNULL)
+		
+		shutil.copytree(efi_path, pkg_payload)
+		
+	elif os.path.isfile(os.path.join(pkg_temp, 'Payload')) :
+		payload_init = os.path.join(pkg_temp, 'Payload')
+		payload_pbzx = os.path.join(pkg_temp, 'Payload.pbzx')
+		payload_extr = os.path.join(pkg_temp, 'Payload', '')
+		zip_path = os.path.join(payload_extr, 'usr', 'standalone', 'firmware', 'bridgeOSCustomer.bundle', 'Contents', 'Resources', 'UpdateBundle')
+		efi_path = os.path.join(zip_path, 'boot', 'Firmware', 'MacEFI', '')
+		
+		os.replace(payload_init, payload_pbzx)
+		
+		subprocess.run([anytoiso_path, '/extract', payload_pbzx, payload_extr], check = True, stdout=subprocess.DEVNULL)
+		
+		subprocess.run([anytoiso_path, '/extract', zip_path + '.zip', zip_path], check = True, stdout=subprocess.DEVNULL)
+		
+		if os.path.exists(efi_path) : shutil.copytree(efi_path, pkg_payload)
+		
+	shutil.rmtree(pkg_temp)
+	
+	im4p_files = []
+	for root, dirs, files in os.walk(pkg_payload):
+		for name in files :
+			if name.endswith('.im4p') :
+				im4p_files.append(os.path.join(root, name))
+	
+	if im4p_files : subprocess.run(['python', 'Apple_EFI_Split.py', '-skip', *im4p_files], check = True, stdout=subprocess.DEVNULL)
+	for im4p in im4p_files : os.remove(im4p)
+	
+	final_files = []
+	for root, dirs, files in os.walk(pkg_payload):
+		for name in files :
+			final_files.append(os.path.join(root, name))
+	
+	if final_files : subprocess.run(['python', 'Apple_EFI_Rename.py', '-skip', *final_files], check = True, stdout=subprocess.DEVNULL)
+	
+	for root, dirs, files in os.walk(pkg_payload):
+		for name in files :
+			if not os.path.isfile(os.path.join(final_path, name)) :
+				shutil.copy2(os.path.join(root, name), os.path.join(final_path, name))
+			
+	shutil.rmtree(pkg_payload)
+
+else :
+	input('\nDone!')

Apple EFI Sucatalog Link Grabber/Apple_EFI_Links.py

@@ -3,17 +3,17 @@
 """
 Apple EFI Links
 Apple EFI Sucatalog Link Grabber
-Copyright (C) 2018 Plato Mavropoulos
+Copyright (C) 2018-2019 Plato Mavropoulos
 """
 
-print('Apple EFI Sucatalog Link Grabber v1.1\n')
+print('Apple EFI Sucatalog Link Grabber v1.2\n')
 
 import os
 import sys
+import datetime
 
 # Remove previous output files
 if os.path.isfile('OUT.txt') : os.remove('OUT.txt')
-if os.path.isfile('EFI.txt') : os.remove('EFI.txt')
 
 # Get input catalog file paths
 if len(sys.argv) >= 2 :
@@ -31,6 +31,10 @@
 
 # Parse each input xml file
 for input_file in catalogs :
+	input_name,input_extension = os.path.splitext(os.path.basename(input_file))
+	
+	print('\n%s%s' % (input_name, input_extension))
+	
 	with open(input_file, 'r') as in_file :
 		for line in in_file :
 			# Find EFI Firmware package links
@@ -54,7 +58,13 @@
 
 		final_lines = ''.join(map(str, sorted(final_lines)))
 
-		with open('EFI.txt', 'w') as efi_file : efi_file.write(final_lines) # Save final output file
+		current_datetime = datetime.datetime.utcnow().isoformat(timespec='seconds').replace('-','').replace('T','').replace(':','')
+		
+		output_file = 'EFI %s.txt' % current_datetime
+		
+		with open(output_file, 'w') as efi_file : efi_file.write(final_lines) # Save final output file
+		
+		print('\nStored %s!' % output_file)
 
 	os.remove('OUT.txt') # Remove temporary output file