From f1e838250545d751912ecb8f4ed8cf047573d3fc Mon Sep 17 00:00:00 2001 From: ave Date: Sun, 22 Aug 2021 18:57:56 +0300 Subject: [PATCH] ctcconfig: Use better defaults --- .gitignore | 1 + resources/scripts/ctcci/ctcconfig.example.py | 26 ++++++++------------ 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index e1cb701..4dbd9d3 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ patches/*/*.patch-failed resources/distok/versionlogs/* !resources/distok/versionlogs/.gitkeep resources/fdroid/repo/icons/*.xml +resources/fonts/*.ttf *.apk diff --git a/resources/scripts/ctcci/ctcconfig.example.py b/resources/scripts/ctcci/ctcconfig.example.py index ff8f65a..095f888 100644 --- a/resources/scripts/ctcci/ctcconfig.example.py +++ b/resources/scripts/ctcci/ctcconfig.example.py @@ -1,6 +1,7 @@ import os -APKTOOL_BIN = "java -jar /opt/ctc/tools/apktool.jar" # use latest +APKTOOL_BIN = "java -jar /opt/ctc/tools/apktool.jar" +DEX2JAR_BIN = "java -jar /opt/ctc/tools/dex2jar.jar" # APKs must be placed under $DISTOK_FOLDER/android/$PACKAGE_ID-$VERSION_NUMBER.apk # Example: /home/ave/distok/android/com.discord-909.apk @@ -15,14 +16,14 @@ FDROID_FOLDER = "/opt/ctc/gitrepo/resources/fdroid" RESULT_FOLDER = FDROID_FOLDER + "/repo" # Repo for CutTheCord (https://gitdab.com/distok/cutthecord) -DO_GITPULL = True +DO_GITPULL = False REPO_FOLDER = "/opt/ctc/gitrepo" # If false, jarsigner will be used for signing the apk. DO_APKSIGNER = True # Keystore file, alias and pass. Required. -KEYSTORE_FILE = "/opt/ctc/gitrepo/resources/keystore.jks" +KEYSTORE_FILE = "/opt/ctc/keystores/keystore.jks" KEYSTORE_ALIAS = "test" KEYSTORE_PASS = "password" @@ -42,8 +43,7 @@ PACKAGE_ID = "com.discord" FORCE = False # Custom ringtones, default = applied to all the ones not explicitly stated -RINGTONES = {"ave": "/opt/ctc/gitrepo/resources/ringtones/sans.mp3", - "default": "/opt/ctc/gitrepo/resources/ringtones/removeskype.mp3"} +RINGTONES = {"default": "/opt/ctc/gitrepo/resources/ringtones/removeskype.mp3"} # Custom icons, default = applied to all the ones not explicitly stated ICONS = {"ave": "/opt/ctc/gitrepo/resources/icons/ctclogoave.png", @@ -63,17 +63,11 @@ APP_NAMES = {"ave": "CutTheCord__Ave", "default": "CutTheCord"} # Custom fonts, default = applied to all the ones not explicitly stated -FONTS = {"ellie": {"whitney_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/GoogleSans-Bold.ttf", - "whitney_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/GoogleSans-Medium.ttf", - "whitney_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/GoogleSans-Regular.ttf"}, - "dyslexic": {"whitney_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/OpenDyslexic3-Bold.ttf", - "whitney_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/OpenDyslexic3-Bold.ttf", - "whitney_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/OpenDyslexic3-Regular.ttf"}, - "murm": {"whitney_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/comicbd.ttf", - "whitney_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/comicbd.ttf", - "whitney_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/comic.ttf"}, - "ave": {"sourcecodepro_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/comic.ttf"}, - "default": {}} +FONTS = {"ave": {"sourcecodepro_semibold.ttf": "/opt/ctc/gitrepo/resources/fonts/comic.ttf", + "ginto_bold.ttf": "/opt/ctc/gitrepo/resources/fonts/whitney_bold.ttf", + "ginto_medium.ttf": "/opt/ctc/gitrepo/resources/fonts/whitney_semibold.ttf", + "ginto_regular.ttf": "/opt/ctc/gitrepo/resources/fonts/whitney_medium.ttf"}, + "default": {}} # Amount of last builds cleanartifacts.py should keep CLEAN_ARTIFACT_KEEP_COUNT = 2