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

fixed cppo cleanup on exit

Browse Source
This commit is contained in:
Ivan X 2016-01-17 10:05:35 -05:00
parent 60f88e4e8a
commit b7528026de
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/tools/cppo.txt
View File

@ -41,6 +41,7 @@ import shutil
import errno import errno
import uuid import uuid
import subprocess import subprocess
import tempfile
# Intentionally fails on pre-2.6 (no b'') so user can see what's wrong # Intentionally fails on pre-2.6 (no b'') so user can see what's wrong
b'ERROR: cppo requires Python 2.6 or later, including 3.x.' b'ERROR: cppo requires Python 2.6 or later, including 3.x.'
@ -749,9 +750,9 @@ def quitNow(exitCode=0):
"If the directory") "If the directory")
print("is shared by Netatalk, please type 'afpsync' now.") print("is shared by Netatalk, please type 'afpsync' now.")
if g.SHK: # clean up if g.SHK: # clean up
for file in os.listdir("/tmp"): for file in os.listdir(tempfile.gettempdir()):
if file.startswith("cppo-"): if file.startswith("cppo-"):
shutil.rmtree(file) shutil.rmtree(tempfile.gettempdir() + "/" + file)
sys.exit(exitCode) sys.exit(exitCode)
def usage(exitcode=1): def usage(exitcode=1):
@ -1179,7 +1180,7 @@ if g.SHK:
g.PNAME = 0 g.PNAME = 0
if not g.CAT: if not g.CAT:
targetDir = (args[3] if g.extractFile else args[2]) targetDir = (args[3] if g.extractFile else args[2])
unshkdir = ("/tmp/cppo-" + str(uuid.uuid4())) unshkdir = (tempfile.gettempdir() + "/cppo-" + str(uuid.uuid4()))
makedirs(unshkdir) makedirs(unshkdir)
result = os.system("/bin/bash -c 'cd " + unshkdir + "; " + result = os.system("/bin/bash -c 'cd " + unshkdir + "; " +
"result=$(nulib2 -xse " + os.path.abspath(g.imageFile) + "result=$(nulib2 -xse " + os.path.abspath(g.imageFile) +
@ -1201,7 +1202,7 @@ if g.SHK:
extractPath = (unshkdir + "/" + g.extractFile) extractPath = (unshkdir + "/" + g.extractFile)
extractPathDir = os.path.dirname(extractPath) extractPathDir = os.path.dirname(extractPath)
# move the extracted file to the root # move the extracted file to the root
newunshkdir = ("/tmp/cppo-" + str(uuid.uuid4())) newunshkdir = (tempfile.gettempdir() + "/cppo-" + str(uuid.uuid4()))
makedirs(newunshkdir) makedirs(newunshkdir)
for filename in os.listdir(extractPathDir): for filename in os.listdir(extractPathDir):
shutil.move(extractPathDir + "/" + filename, newunshkdir) shutil.move(extractPathDir + "/" + filename, newunshkdir)