Update MakeInstall.py

This commit is contained in:
CorpNewt 2019-09-07 13:29:13 -05:00 committed by GitHub
parent a5e0840fcb
commit 474f009c1c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -20,30 +20,6 @@ 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 = [
{
"loc" : "HKLM\\Software\\Classes\\CLSID\\{23170F69-40C1-278A-1000-000100020000}",
"val" : "7-Zip Shell Extension"
},
{
"loc" : "HKLM\\Software\\Classes\\CLSID\\{23170F69-40C1-278A-1000-000100020000}\InprocServer32",
"name": "ThreadingModel",
"val" : "Apartment"
},
{
"loc" : "HKLM\\Software\\Classes\\*\\shellex\\ContextMenuHandlers\\7-Zip",
"val" : "{23170F69-40C1-278A-1000-000100020000}"
},
{
"loc" : "HKLM\\Software\\Classes\\Directory\\shellex\\ContextMenuHandlers\\7-Zip",
"val" : "{23170F69-40C1-278A-1000-000100020000}"
},
{
"loc" : "HKLM\\Software\\Classes\\Folder\\shellex\\ContextMenuHandlers\\7-Zip",
"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"
@ -158,27 +134,6 @@ class WinUSB:
exit(1) exit(1)
# Set the z_path to the 64 bit # Set the z_path to the 64 bit
self.z_path = self.z_path64 self.z_path = self.z_path64
'''print("Setting reg entries...")
for x in self.z_reg:
if not "val" in x or not "loc" in x:
continue
args = ["reg.exe","add",x["loc"]]
if x.get("name",None):
args.extend(["/v",x["name"]])
if x.get("type",None):
args.extend(["/t",x["type"]])
if x.get("val",None):
args.extend(["/d",x["val"]])
args.append("/f")
print(" ".join(args))
out = self.r.run({"args":args})
print(out)
self.u.grab("Paused.")
if out[2] != 0:
print("Error: {}".format(out[1]))
print("")
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)