diff --git a/utils/make_tool.py b/utils/make_tool.py index 742b012..4ac4c17 100644 --- a/utils/make_tool.py +++ b/utils/make_tool.py @@ -118,7 +118,7 @@ class MakeTool: if self.easyNameSuffix == "1": line = '' % ( - self.easyName, value) + self.easyName, value) else: line = '' % (self.easyName) elif line.find('owner') > 0 and self.owner != '': @@ -182,7 +182,6 @@ class MakeTool: with open(os.path.join(self.MakeDir, 'temp/AndroidManifest.xml'), 'w') as f: f.write(tempXML) - unsignApk = os.path.join(self.MakeDir, f'bin/{self.apkName}_{value}_unsigned.apk') cmdPack = f'cd {self.MakeDir} && java -jar apktool.jar b temp -o {unsignApk}' @@ -191,7 +190,9 @@ class MakeTool: signedjar = os.path.join(self.MakeDir, f'bin/{self.apkName}_{value}.apk') unsignedjar = os.path.join(self.MakeDir, f'bin/{self.apkName}_{value}_unsigned.apk') - cmd_sign = f'cd {os.path.join(self.MakeDir,"android-sdk/build-tools/26.0.1")} && ./apksigner sign --ks {self.keystore} --ks-key-alias {self.alianame} {signedjar}' + # cmd_sign = f'cd {os.path.join(self.MakeDir,"android-sdk/build-tools/26.0.1")} && ./apksigner sign --ks {self.keystore} --ks-key-alias {self.alianame} {signedjar}' + cmd_sign = r'cd %s && java -jar apksigner.jar sign --ks %s --ks-key-alias %s --ks-pass pass:%s --key-pass pass:%s --out %s %s' % ( + self.MakeDir, self.keystore, self.alianame, self.storepass, self.keypass, signedjar, unsignedjar) os.system(cmd_sign) os.remove(unsignedjar)