mirror of
https://github.com/corpnewt/gibMacOS.git
synced 2024-09-20 01:30:33 +00:00
Update MakeInstall.py
This commit is contained in:
parent
1d357c00cb
commit
a5e0840fcb
1 changed files with 22 additions and 10 deletions
|
@ -20,7 +20,7 @@ class WinUSB:
|
||||||
self.z_url2 = "https://www.7-zip.org/a/7z1806-x64.msi"
|
self.z_url2 = "https://www.7-zip.org/a/7z1806-x64.msi"
|
||||||
self.z_url = "https://www.7-zip.org/a/7z[[vers]]-x64.msi"
|
self.z_url = "https://www.7-zip.org/a/7z[[vers]]-x64.msi"
|
||||||
self.z_name = "7z.exe"
|
self.z_name = "7z.exe"
|
||||||
self.z_reg = [
|
'''self.z_reg = [
|
||||||
{
|
{
|
||||||
"loc" : "HKLM\\Software\\Classes\\CLSID\\{23170F69-40C1-278A-1000-000100020000}",
|
"loc" : "HKLM\\Software\\Classes\\CLSID\\{23170F69-40C1-278A-1000-000100020000}",
|
||||||
"val" : "7-Zip Shell Extension"
|
"val" : "7-Zip Shell Extension"
|
||||||
|
@ -31,18 +31,19 @@ class WinUSB:
|
||||||
"val" : "Apartment"
|
"val" : "Apartment"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"loc" : "HKLM\\Software\\Classes\\*\\shellex\\ContextMenuHanders\\7-Zip",
|
"loc" : "HKLM\\Software\\Classes\\*\\shellex\\ContextMenuHandlers\\7-Zip",
|
||||||
"val" : "{23170F69-40C1-278A-1000-000100020000}"
|
"val" : "{23170F69-40C1-278A-1000-000100020000}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"loc" : "HKLM\\Software\\Classes\\Directory\\shellex\\ContextMenuHanders\\7-Zip",
|
"loc" : "HKLM\\Software\\Classes\\Directory\\shellex\\ContextMenuHandlers\\7-Zip",
|
||||||
"val" : "{23170F69-40C1-278A-1000-000100020000}"
|
"val" : "{23170F69-40C1-278A-1000-000100020000}"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"loc" : "HKLM\\Software\\Classes\\Folder\\shellex\\ContextMenuHanders\\7-Zip",
|
"loc" : "HKLM\\Software\\Classes\\Folder\\shellex\\ContextMenuHandlers\\7-Zip",
|
||||||
"val" : "{23170F69-40C1-278A-1000-000100020000}"
|
"val" : "{23170F69-40C1-278A-1000-000100020000}"
|
||||||
},
|
},
|
||||||
]
|
]'''
|
||||||
|
self.z_reg = []
|
||||||
self.bi_url = "https://raw.githubusercontent.com/corpnewt/gibMacOS/master/Scripts/BOOTICEx64.exe"
|
self.bi_url = "https://raw.githubusercontent.com/corpnewt/gibMacOS/master/Scripts/BOOTICEx64.exe"
|
||||||
self.bi_name = "BOOTICEx64.exe"
|
self.bi_name = "BOOTICEx64.exe"
|
||||||
self.clover_url = "https://api.github.com/repos/dids/clover-builder/releases/latest"
|
self.clover_url = "https://api.github.com/repos/dids/clover-builder/releases/latest"
|
||||||
|
@ -136,10 +137,10 @@ class WinUSB:
|
||||||
# looking for the current version
|
# looking for the current version
|
||||||
dl_url = None
|
dl_url = None
|
||||||
try:
|
try:
|
||||||
json = json.loads(self.dl.get_string(self.z_json))
|
json_data = json.loads(self.dl.get_string(self.z_json))
|
||||||
v_num = json.get("release",{}).get("filename","").split("/")[-1].lower().replace("7z","").replace(".exe","")
|
v_num = json_data.get("release",{}).get("filename","").split("/")[-1].lower().split("-")[0].replace("7z","").replace(".exe","")
|
||||||
if len(v_num):
|
if len(v_num):
|
||||||
dl_url = self.url.replace("[[vers]]",v_num)
|
dl_url = self.z_url.replace("[[vers]]",v_num)
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
if not dl_url:
|
if not dl_url:
|
||||||
|
@ -149,8 +150,15 @@ class WinUSB:
|
||||||
print("")
|
print("")
|
||||||
print("Installing 7zip...")
|
print("Installing 7zip...")
|
||||||
# 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.r.run({"args":["msiexec", "/qn", "/i", os.path.join(temp, self.z_name)],"stream":True})
|
out = self.r.run({"args":["msiexec", "/qn", "/i", os.path.join(temp, self.z_name)],"stream":True})
|
||||||
print("Setting reg entries...")
|
if out[2] != 0:
|
||||||
|
print("Error ({})".format(out[2]))
|
||||||
|
print("")
|
||||||
|
self.u.grab("Press [enter] to exit...")
|
||||||
|
exit(1)
|
||||||
|
# Set the z_path to the 64 bit
|
||||||
|
self.z_path = self.z_path64
|
||||||
|
'''print("Setting reg entries...")
|
||||||
for x in self.z_reg:
|
for x in self.z_reg:
|
||||||
if not "val" in x or not "loc" in x:
|
if not "val" in x or not "loc" in x:
|
||||||
continue
|
continue
|
||||||
|
@ -162,11 +170,15 @@ class WinUSB:
|
||||||
if x.get("val",None):
|
if x.get("val",None):
|
||||||
args.extend(["/d",x["val"]])
|
args.extend(["/d",x["val"]])
|
||||||
args.append("/f")
|
args.append("/f")
|
||||||
|
print(" ".join(args))
|
||||||
out = self.r.run({"args":args})
|
out = self.r.run({"args":args})
|
||||||
|
print(out)
|
||||||
|
self.u.grab("Paused.")
|
||||||
if out[2] != 0:
|
if out[2] != 0:
|
||||||
print("Error: {}".format(out[1]))
|
print("Error: {}".format(out[1]))
|
||||||
print("")
|
print("")
|
||||||
self.u.grab("Press [enter] to exit...")
|
self.u.grab("Press [enter] to exit...")
|
||||||
|
exit(1)'''
|
||||||
print("")
|
print("")
|
||||||
return os.path.exists(self.z_path)
|
return os.path.exists(self.z_path)
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue