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

cppo bug fix on unreferenced origFileName

Browse Source
This commit is contained in:
Ivan X
2016-01-03 05:30:17 -05:00
parent 7e12bbd696
commit 1403fde73d
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/tools/cppo.txt
View File

@@ -519,6 +519,8 @@ def processEntry(arg1, arg2):
getFileLength(arg1, arg2), getAuxType(arg1, arg2), getFileLength(arg1, arg2), getAuxType(arg1, arg2),
getCreationDate(arg1, arg2), getModifiedDate(arg1, arg2)) getCreationDate(arg1, arg2), getModifiedDate(arg1, arg2))
''' '''
origFileName = None
g.shk_rfork = (1 if (g.SHK and (arg2[-1:] == "r")) else 0) g.shk_rfork = (1 if (g.SHK and (arg2[-1:] == "r")) else 0)
if g.SHK: # ShrinkIt archive if g.SHK: # ShrinkIt archive
g.activeFileName = (arg2 if g.EX else arg2.split('#')[0]) g.activeFileName = (arg2 if g.EX else arg2.split('#')[0])
@@ -1145,6 +1147,7 @@ if (g.SHK or
sys.exit(2) sys.exit(2)
if g.SHK: if g.SHK:
g.PNAME = 0
if not g.DIR: if not g.DIR:
targetDir = (args[3] if (len(args) == 4) else args[2]) targetDir = (args[3] if (len(args) == 4) else args[2])
unshkdir = ("/tmp/cppo-" + str(uuid.uuid4())) unshkdir = ("/tmp/cppo-" + str(uuid.uuid4()))
@@ -1188,6 +1191,8 @@ if g.SHK:
shutil.rmtree(unshkdir, True) shutil.rmtree(unshkdir, True)
syncExit() syncExit()
# end script if SHK
g.imageData = loadFile(g.imageFile) g.imageData = loadFile(g.imageFile)
# detect if image is 2mg and remove 64-byte header if so # detect if image is 2mg and remove 64-byte header if so
@@ -1298,12 +1303,15 @@ if g.D33:
print("ProDOS file not found within image file.") print("ProDOS file not found within image file.")
syncExit() syncExit()
# below: ProDOS
g.activeDirBlock = 0 g.activeDirBlock = 0
g.activeFileName = "" g.activeFileName = ""
g.activeFileSize = 0 g.activeFileSize = 0
g.activeFileBytesCopied = 0 g.activeFileBytesCopied = 0
g.resourceFork = 0 g.resourceFork = 0
g.PDOSPATH_INDEX = 0 g.PDOSPATH_INDEX = 0
g.PNAME = 0
if (len(args) == 4): if (len(args) == 4):
g.PDOSPATH = g.extractFile.replace(':', '/').split('/') g.PDOSPATH = g.extractFile.replace(':', '/').split('/')

2
setup/index.txt
View File

@@ -9,7 +9,7 @@
# to download and execute, type: # to download and execute, type:
# wget ivanx.com/a2server/setup; source setup # wget ivanx.com/a2server/setup; source setup
a2serverVersion="129d2" a2serverVersion="129d3"
# Ensure URL we'll use ends in a / # Ensure URL we'll use ends in a /
case "$A2SERVER_SCRIPT_URL" in case "$A2SERVER_SCRIPT_URL" in