From fbc6c87ba74c467af7e8fbcfacc3ee1cf83fc4a3 Mon Sep 17 00:00:00 2001 From: Cubitect Date: Mon, 3 Oct 2016 23:40:02 +0100 Subject: [PATCH] path fixes, should now work on Mac --- asmutils.py | 23 +++++++++++++---------- asmutils.pyc | Bin 9253 -> 9605 bytes 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/asmutils.py b/asmutils.py index f2aebbd..36771b0 100644 --- a/asmutils.py +++ b/asmutils.py @@ -22,12 +22,6 @@ def __init__(self,jarpath): self.classdir = join(self.curdir, 'cache', self.vernam, 'classes') self.temdir = join(self.curdir, 'Templates') - self.python2 = sys.executable - print 'Python executable is: ' + self.python2 - - self.disasmpy = self.python2+' '+join(self.curdir,'Krakatau-master','disassemble.py') - self.asmpy = self.python2+' '+join(self.curdir,'Krakatau-master','assemble.py') - self.maps = dict() def setup(self): @@ -72,6 +66,14 @@ def expand(self,key): except: return None + def disasmpy(self,className): + cmd = sys.executable+' "'+join(self.curdir,'Krakatau-master','disassemble.py')+'"' + os.system(cmd+' -out "'+self.asmdir+'" "'+join(self.classdir,className)+'.class" > '+os.devnull) + + def asmpyall(self): + cmd = sys.executable+' "'+join(self.curdir,'Krakatau-master','assemble.py')+'"' + os.system(cmd+' -out "'+self.modcdir+'" -r -q "'+self.modjdir+'"') + def map2j(self,className): className = self.getmap(className) outf = join(self.modjdir,className)+'.j' @@ -81,7 +83,7 @@ def map2j(self,className): if isfile(outf): return outf print 'Disassembling ' + className + '...' - os.system(self.disasmpy+' -out '+self.asmdir+' '+join(self.classdir,className)+'.class > '+os.devnull) + self.disasmpy(className) return outf def getjfile(self,className): @@ -92,7 +94,7 @@ def getjfile(self,className): if isfile(outf): return outf print 'Disassembling ' + className + '...' - os.system(self.disasmpy+' -out '+self.asmdir+' '+join(self.classdir,className)+'.class > '+os.devnull) + self.disasmpy(className) return outf def readj(self,className): @@ -115,8 +117,7 @@ def write2mod(self,className,lines): def install(self,instver): # create the mod print 'Reassembling the modded classes...' - os.system(self.asmpy+' -out '+self.modcdir+' -r -q '+self.modjdir) - + self.asmpyall() # install the mod copytree(self.modcdir,self.classdir) instdir = self.jardir.replace(self.vernam,instver) @@ -125,6 +126,8 @@ def install(self,instver): if not isdir(instdir): os.makedirs(instdir) instzip = shutil.make_archive(instjar,format="zip",root_dir=self.classdir) + if isfile(instjar): + os.remove(instjar) os.rename(instzip,instjar) oldjson = join(self.jardir,self.vernam+'.json') diff --git a/asmutils.pyc b/asmutils.pyc index 6c1557945611fb0a9e1f48de509a670d5afd361c..94ba38122964a661b508244000a16508025e47a5 100644 GIT binary patch literal 9605 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 literal 9253 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 Z@52NuIey0Vcwy#U6hh-DgNpL0{2gvf0}lWI