diff --git a/patchport.py b/patchport.py index f8f4f97..8480c89 100644 --- a/patchport.py +++ b/patchport.py @@ -20,6 +20,9 @@ cutthecord_folder = os.path.dirname(os.path.realpath(__file__)) debug = False tmp_folder = "/tmp/patchport" +if debug: + print(f"ctc folder: {cutthecord_folder}") + def modify_patch(patch_name, patch_path): with open(patch_path) as f: @@ -89,7 +92,7 @@ re_versioncode_xml = re.compile(r'(platformBuildVersionCode="[0-9]+")') re_versionname_xml = re.compile(r'(platformBuildVersionName="[0-9a-z.]+")') re_versioncode_yml = re.compile(r'versionCode: \'([0-9]+)\'') -re_versionname_yml = re.compile(r'versionName: ([0-9a-z.]+)') +re_versionname_yml = re.compile(r'versionName: (.+)$') re_releasedate = re.compile(r'released on ([0-9]{4}-[0-9]{2}-[0-9]{2})') re_crashlytics = re.compile(r'com\.crashlytics\.android\.build_id">([a-z0-9]' @@ -112,8 +115,13 @@ with open(os.path.join(apk_folder, "res", "values", "strings.xml")) as f: failures = [] for patch in os.listdir(os.path.join(cutthecord_folder, "patches")): + if debug: + print(f"going over patch: {patch}") + # Ignore non-dirs - if not os.path.isdir(patch): + if not os.path.isdir(os.path.join(cutthecord_folder, "patches", patch)): + if debug: + print(f"patch is not a folder, skipping: {patch}") continue patch_path = os.path.join(cutthecord_folder, "patches", patch,