From 08986e926cceadf44400cf174e5d7f8726a29880 Mon Sep 17 00:00:00 2001
From: Ave Ozkal <ave@ave.zone>
Date: Tue, 8 Oct 2019 05:14:07 +0300
Subject: [PATCH] necessary/notrack/ctcci: Move things so that patches need
 minimal intervention with the latest changes to clear up space for us

---
 ctcci/ctcci.py                        | 4 ++--
 patches/{necessary => notrack}/968.sh | 0
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename patches/{necessary => notrack}/968.sh (100%)

diff --git a/ctcci/ctcci.py b/ctcci/ctcci.py
index 2ca1853..35e231a 100644
--- a/ctcci/ctcci.py
+++ b/ctcci/ctcci.py
@@ -205,6 +205,8 @@ for patch_name in PATCHES:
                                          "font", font))
     # Apply any other patches
     else:
+        patch(patch_file, WORK_APK_PATH, patch_name)
+
         patch_script = os.path.join(REPO_FOLDER, "patches",
                                     patch_name, f"{VERSION}.sh")
         if os.path.exists(patch_script):
@@ -212,8 +214,6 @@ for patch_name in PATCHES:
                            shell=True,
                            cwd=WORK_APK_PATH)
 
-        patch(patch_file, WORK_APK_PATH, patch_name)
-
 # Pack the APK
 subprocess.run(f"{APKTOOL_BIN} b discord",
                shell=True,
diff --git a/patches/necessary/968.sh b/patches/notrack/968.sh
similarity index 100%
rename from patches/necessary/968.sh
rename to patches/notrack/968.sh