Apple-2-SW/a2server
1
0
Fork 0
mirror of https://github.com/RasppleII/a2server.git synced 2025-01-11 11:31:21 +00:00
Code Issues Projects Releases Wiki Activity

hfsutils works if installed (no check for that)

Browse Source
This commit is contained in:
T. Joseph Carter 2015-11-09 03:58:56 -08:00
parent cc89978e52
commit 4587df5bf9
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
experimental/install-gsos.py
View File

@ -173,7 +173,6 @@ def install_bootblocks(installdir, installtype):
platform = os.uname()[0] platform = os.uname()[0]
if platform not in ['Linux', 'Darwin']: if platform not in ['Linux', 'Darwin']:
platform = "hfsutils" platform = "hfsutils"
platform = "hfsutils"
unpacked_a2boot = False unpacked_a2boot = False
for bootfile in a2boot_files: for bootfile in a2boot_files:
@ -202,21 +201,35 @@ def install_bootblocks(installdir, installtype):
a2setup_img_name]) a2setup_img_name])
mountpoint = find_mountpoint(xmlstr) mountpoint = find_mountpoint(xmlstr)
srcdir = os.path.join(mountpoint, 'System Folder') srcdir = os.path.join(mountpoint, 'System Folder')
elif platform == 'hfsutils':
srcdir = os.path.join(bootblock_tmp, 'a2boot')
os.mkdir(srcdir)
subprocess.check_output(['hmount', a2setup_img_name])
subprocess.check_output(['hcopy', 'Apple II Setup:System Folder:*',
srcdir])
subprocess.check_output(['humount', 'Apple II Setup'])
unpacked_a2boot = True unpacked_a2boot = True
# Copy the file # Copy the file
if platform == 'Darwin': if platform == 'Darwin':
src = os.path.join(srcdir, bootfile['unix']) src = os.path.join(srcdir, bootfile['unix'])
elif platform == 'hfsutils':
src = os.path.join(srcdir, bootfile['hfsutils'])
shutil.copyfile(src, dst) shutil.copyfile(src, dst)
# Clean up the mounted/unpacked image
if unpacked_a2boot: if unpacked_a2boot:
if platform == 'Darwin': if platform == 'Darwin':
subprocess.check_output(['hdiutil', 'eject', mountpoint]) subprocess.check_output(['hdiutil', 'eject', mountpoint])
elif platform == 'hfsutils':
for bootfile in a2boot_files:
name = os.path.join(srcdir, bootfile['hfsutils'])
if os.path.isfile(name):
os.unlink(name)
os.rmdir(srcdir)
os.unlink(a2setup_img_name) os.unlink(a2setup_img_name)
print ('Contents of "' + installdir + '"')
os.system('ls -l "' + installdir + '"')
os.removedirs(bootblock_tmp) os.removedirs(bootblock_tmp)
def do_install(): def do_install():