Skip to content

Commit 4d35c6e

Browse files
committed
added support for locking prebuilt versions
1 parent 2f52914 commit 4d35c6e

File tree

3 files changed

+26
-5
lines changed

3 files changed

+26
-5
lines changed

CONFIG.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,16 @@ uptodown-dlurl = "https://app.en.uptodown.com/android"
1515
## If you'd like to get to know more about other options:
1616

1717
There exists an example below with all defaults shown and all the keys explicitly set.
18-
All keys are optional (except download urls) and are assigned to their default values if not set explicitly.
18+
**All keys are optional** (except download urls) and are assigned to their default values if not set explicitly.
1919

2020
```toml
21+
patches-source = "revanced/revanced-patches" # where to fetch patches bundle from. default: "revanced/revanced-patches"
22+
integrations-source = "revanced/revanced-integrations" # where to fetch integrations from. default: "revanced/revanced-integrations"
23+
rv-brand = "ReVanced Extended" # rebrand from 'ReVanced' to something different. default: "ReVanced"
24+
25+
patches-version = "v2.160.0" # locks the patches version. default: latest available
26+
integrations-version = "v0.95.0" # locks the integrations version. default: latest available
27+
2128
[Some-App]
2229
app-name = "SomeApp" # if set, app name becomes SomeApp instead of Some-App. default is same as table name, which is 'Some-App' here.
2330
# this affects the release name and stuff like that

build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set -euo pipefail
44

55
source utils.sh
6-
trap "rm -rf temp/tmp.*" INT
6+
trap "rm -rf temp/tmp.*; exit 1" INT
77

88
: >build.md
99

@@ -29,6 +29,8 @@ ENABLE_MAGISK_UPDATE=$(toml_get "$main_config_t" enable-magisk-update) || abort
2929
PARALLEL_JOBS=$(toml_get "$main_config_t" parallel-jobs) || abort "ERROR: parallel-jobs is missing"
3030
BUILD_MINDETACH_MODULE=$(toml_get "$main_config_t" build-mindetach-module) || abort "ERROR: build-mindetach-module is missing"
3131
LOGGING_F=$(toml_get "$main_config_t" logging-to-file) && vtf "$LOGGING_F" "logging-to-file" || LOGGING_F=false
32+
CONF_PATCHES_VER=$(toml_get "$main_config_t" patches-version) || CONF_PATCHES_VER=
33+
CONF_INTEGRATIONS_VER=$(toml_get "$main_config_t" integrations-version) || CONF_INTEGRATIONS_VER=
3234

3335
PATCHES_SRC=$(toml_get "$main_config_t" patches-source) || PATCHES_SRC="revanced/revanced-patches"
3436
INTEGRATIONS_SRC=$(toml_get "$main_config_t" integrations-source) || INTEGRATIONS_SRC="revanced/revanced-integrations"

utils.sh

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,27 @@ pr() { echo -e "\033[0;32m[+] ${1}\033[0m"; }
3939

4040
get_prebuilts() {
4141
pr "Getting prebuilts"
42-
local rv_cli_url rv_integrations_url rv_patches rv_patches_changelog rv_patches_dl rv_patches_url
42+
local rv_cli_url rv_integrations_url rv_patches rv_patches_changelog rv_patches_dl rv_patches_url rv_integrations_rel rv_patches_rel
4343
rv_cli_url=$(gh_req "https://api.github.com/repos/j-hc/revanced-cli/releases/latest" - | json_get 'browser_download_url') || return 1
4444
RV_CLI_JAR="${PREBUILTS_DIR}/${rv_cli_url##*/}"
4545
log "CLI: ${rv_cli_url##*/}"
4646

47-
rv_integrations_url=$(gh_req "https://api.github.com/repos/${INTEGRATIONS_SRC}/releases/latest" - | json_get 'browser_download_url')
47+
if [ "$CONF_INTEGRATIONS_VER" ]; then
48+
rv_integrations_rel="https://api.github.com/repos/${INTEGRATIONS_SRC}/releases/tags/${CONF_INTEGRATIONS_VER}"
49+
else
50+
rv_integrations_rel="https://api.github.com/repos/${INTEGRATIONS_SRC}/releases/latest"
51+
fi
52+
if [ "$CONF_PATCHES_VER" ]; then
53+
rv_patches_rel="https://api.github.com/repos/${PATCHES_SRC}/releases/tags/${CONF_PATCHES_VER}"
54+
else
55+
rv_patches_rel="https://api.github.com/repos/${PATCHES_SRC}/releases/latest"
56+
fi
57+
58+
rv_integrations_url=$(gh_req "$rv_integrations_rel" - | json_get 'browser_download_url')
4859
RV_INTEGRATIONS_APK="${PREBUILTS_DIR}/${rv_integrations_url##*/}"
4960
log "Integrations: ${rv_integrations_url##*/}"
5061

51-
rv_patches=$(gh_req "https://api.github.com/repos/${PATCHES_SRC}/releases/latest" -)
62+
rv_patches=$(gh_req "$rv_patches_rel" -)
5263
rv_patches_changelog=$(echo "$rv_patches" | json_get 'body' | sed 's/\(\\n\)\+/\\n/g')
5364
rv_patches_dl=$(json_get 'browser_download_url' <<<"$rv_patches")
5465
RV_PATCHES_JSON="${PREBUILTS_DIR}/patches-$(json_get 'tag_name' <<<"$rv_patches").json"
@@ -160,6 +171,7 @@ get_apkmirror_vers() {
160171
if [ "$allow_alpha_version" = false ]; then
161172
local IFS=$'\n'
162173
vers=$(grep -iv "\(beta\|alpha\)" <<<"$vers")
174+
local v
163175
local r_vers=()
164176
for v in $vers; do
165177
grep -iq "${v} \(beta\|alpha\)" <<<"$apkm_resp" || r_vers+=("$v")

0 commit comments

Comments
 (0)