Macintosh-Tools
/
tbxi-patches
mirror of https://github.com/elliotnunn/tbxi-patches.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bad path-manipulation bug 

Apparent when relative paths are used
This commit is contained in:
Elliot Nunn 2019-09-01 08:45:21 +08:00
parent fdab20e7c6
commit 1626faad7e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ataboot.py
View File

@ -80,7 +80,7 @@ found_drvr = False
for (parent, folders, files) in os.walk(src):
folders.sort(); files.sort() # make it kinda deterministic
for filename in files:
full = path.join(src, parent, filename)
full = path.join(parent, filename)
if filename == 'DRVR_-20175_ATALoad':
code = open(full, 'rb').read()

8
macmini.py
View File

@ -330,7 +330,7 @@ def patch_booter(text):
for (parent, folders, files) in os.walk(src):
folders.sort(); files.sort() # make it kinda deterministic
for filename in files:
full = path.join(src, parent, filename)
full = path.join(parent, filename)
if filename.startswith('NanoKernel'):
code = open(full, 'rb').read()
@ -344,15 +344,15 @@ for (parent, folders, files) in os.walk(src):
open(full, 'w').write(text)
elif filename == 'Parcelfile':
if not path.exists(path.join(src, parent, 'kauai-ata.pef')):
if not path.exists(path.join(parent, 'kauai-ata.pef')):
print('ROM lacks Kauai ATA driver (< ROM 9.1), patching it in') # the only known version
shutil.copy(path.join(path.dirname(__file__), 'kauai-ata.pef'), path.join(src, parent))
shutil.copy(path.join(path.dirname(__file__), 'kauai-ata.pef'), parent)
with open(full, 'a') as f:
f.write('prop flags=0x0000c a=kauai-ata b=ata\n')
f.write('\tndrv flags=0x00006 name=driver,AAPL,MacOS,PowerPC src=kauai-ata.pef.lzss\n\n')
if path.exists(path.join(src, parent, 'MotherBoardHAL.pef')):
if path.exists(path.join(parent, 'MotherBoardHAL.pef')):
print('ROM has MotherBoardHAL (< ROM 6.7), therefore unlikely to work')
elif filename == 'cicn_-20020':