Upstream/gibMacOS
1
0
Fork 0
mirror of https://github.com/corpnewt/gibMacOS.git synced 2025-01-07 18:47:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update pathing, mount first partition after format

Browse Source
This commit is contained in:
CorpNewt 2019-12-30 16:09:33 -06:00 committed by GitHub
parent 8dc2a1c78a
commit 2722baea6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MakeInstall.py
View File

@ -24,6 +24,7 @@ class WinUSB:
self.bi_name = "BOOTICEx64.exe" self.bi_name = "BOOTICEx64.exe"
self.clover_url = "https://api.github.com/repos/CloverHackyColor/CloverBootloader/releases" self.clover_url = "https://api.github.com/repos/CloverHackyColor/CloverBootloader/releases"
self.dids_url = "https://api.github.com/repos/dids/clover-builder/releases" self.dids_url = "https://api.github.com/repos/dids/clover-builder/releases"
self.diskpart = os.path.join(os.environ['SYSTEMDRIVE'] + "\\", "Windows", "System32", "diskpart.exe")
# From Tim Sutton's brigadier: https://github.com/timsutton/brigadier/blob/master/brigadier # From Tim Sutton's brigadier: https://github.com/timsutton/brigadier/blob/master/brigadier
self.z_path = None self.z_path = None
self.z_path64 = os.path.join(os.environ['SYSTEMDRIVE'] + "\\", "Program Files", "7-Zip", "7z.exe") self.z_path64 = os.path.join(os.environ['SYSTEMDRIVE'] + "\\", "Program Files", "7-Zip", "7z.exe")
@ -195,7 +196,7 @@ class WinUSB:
self.u.grab("Press [enter] to return...") self.u.grab("Press [enter] to return...")
return return
# Let's try to run it! # Let's try to run it!
out = self.r.run({"args":["diskpart","/s",script],"stream":True}) out = self.r.run({"args":[self.diskpart,"/s",script],"stream":True})
# Ditch our script regardless of whether diskpart worked or not # Ditch our script regardless of whether diskpart worked or not
shutil.rmtree(temp) shutil.rmtree(temp)
print("") print("")
@ -226,7 +227,9 @@ class WinUSB:
"create partition primary size=200", "create partition primary size=200",
"format quick fs=fat32 label='CLOVER'", "format quick fs=fat32 label='CLOVER'",
"active", "active",
"create partition primary id=AB" # AF = HFS, AB = Recovery "create partition primary id=AB", # AF = HFS, AB = Recovery
"select part 1",
"assign"
]) ])
else: else:
print("Using GPT...") print("Using GPT...")
@ -250,7 +253,7 @@ class WinUSB:
self.u.grab("Press [enter] to return...") self.u.grab("Press [enter] to return...")
return return
# Let's try to run it! # Let's try to run it!
out = self.r.run({"args":["diskpart","/s",script],"stream":True}) out = self.r.run({"args":[self.diskpart,"/s",script],"stream":True})
# Ditch our script regardless of whether diskpart worked or not # Ditch our script regardless of whether diskpart worked or not
shutil.rmtree(temp) shutil.rmtree(temp)
if out[2] != 0: if out[2] != 0: