mirrors/brigadier
1
0
Fork 0
mirror of https://github.com/timsutton/brigadier.git synced 2025-05-29 06:25:36 -04:00
Code Issues Projects Releases Packages Wiki Activity

No more dmg2iso

Browse source
This commit is contained in:
Timothy Sutton 2016-03-19 00:37:13 -04:00
parent 70e0f8443b
commit 61ff50be83
1 changed files with 2 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

23
brigadier
View file

@ -19,8 +19,6 @@ from xml.dom import minidom
SUCATALOG_URL = 'http://swscan.apple.com/content/catalogs/others/index-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog' SUCATALOG_URL = 'http://swscan.apple.com/content/catalogs/others/index-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1.sucatalog'
# 7-Zip MSI (15.14) # 7-Zip MSI (15.14)
SEVENZIP_URL = 'http://www.7-zip.org/a/7z1514-x64.msi' SEVENZIP_URL = 'http://www.7-zip.org/a/7z1514-x64.msi'
# dmg2img zip download from http://vu1tur.eu.org/tools
DMG2IMG_URL = 'http://vu1tur.eu.org/tools/dmg2img-1.6.5-win32.zip'
def status(msg): def status(msg):
print "%s\n" % msg print "%s\n" % msg
@ -63,17 +61,6 @@ def downloadFile(url, filename):
urlretrieve(url, filename, reporthook=reporthook) urlretrieve(url, filename, reporthook=reporthook)
def getDmg2Img():
tempdir = tempfile.mkdtemp()
dmg2img_path = os.path.join(tempdir, DMG2IMG_URL.split('/')[-1])
downloadFile(DMG2IMG_URL, dmg2img_path)
sevenzipExtract(dmg2img_path)
dmg2img_exe = os.path.join(tempdir, 'dmg2img.exe')
if os.path.exists(dmg2img_exe):
return dmg2img_exe
else:
sys.exit("Can't find extracted dmg2img.exe")
def sevenzipExtract(arcfile, command='e', out_dir=None): def sevenzipExtract(arcfile, command='e', out_dir=None):
cmd = [os.path.join(os.environ['SYSTEMDRIVE'] + "\\", "Program Files", "7-Zip", "7z.exe")] cmd = [os.path.join(os.environ['SYSTEMDRIVE'] + "\\", "Program Files", "7-Zip", "7z.exe")]
cmd.append(command) cmd.append(command)
@ -307,14 +294,8 @@ when running the installer out of 'system32'." % output_dir)
os.path.join(arc_workdir, 'Payload~')]: os.path.join(arc_workdir, 'Payload~')]:
if os.path.exists(arc): if os.path.exists(arc):
sevenzipExtract(arc) sevenzipExtract(arc)
# finally, 7-Zip also extracts the tree within the DMG to the output dir
dmg2iso_path = getDmg2Img() sevenzipExtract(os.path.join(arc_workdir, 'WindowsSupport.dmg'),
dmg_extract_cmd = [dmg2iso_path, '-v',
os.path.join(arc_workdir, 'WindowsSupport.dmg'),
os.path.join(arc_workdir, 'WindowsSupport.iso')]
subprocess.call(dmg_extract_cmd)
sevenzipExtract(os.path.join(arc_workdir, 'WindowsSupport.iso'),
command='x', command='x',
out_dir=landing_dir) out_dir=landing_dir)
if we_installed_7zip: if we_installed_7zip: