mirror of
https://github.com/j-hc/revanced-magisk-module.git
synced 2025-04-29 22:24:34 +02:00
added my archive as apk provider
This commit is contained in:
j-hc
parent
cf35886fd3
commit
4cab1a8f03
4
build.sh
4
build.sh
@ -137,6 +137,10 @@ for table_name in $(toml_get_table_names); do
|
||||
app_args[apkmirror_dlurl]=${app_args[apkmirror_dlurl]%/}
|
||||
app_args[dl_from]=apkmirror
|
||||
} || app_args[apkmirror_dlurl]=""
|
||||
app_args[archive_dlurl]=$(toml_get "$t" archive-dlurl) && {
|
||||
app_args[archive_dlurl]=${app_args[archive_dlurl]%/}
|
||||
app_args[dl_from]=archive
|
||||
} || app_args[archive_dlurl]=""
|
||||
if [ -z "${app_args[dl_from]:-}" ]; then abort "ERROR: no 'apkmirror_dlurl', 'uptodown_dlurl' or 'apkmonk_dlurl' option was set for '$table_name'."; fi
|
||||
app_args[arch]=$(toml_get "$t" apkmirror-arch) || app_args[arch]="universal"
|
||||
app_args[include_stock]=$(toml_get "$t" include-stock) || app_args[include_stock]=true && vtf "${app_args[include_stock]}" "include-stock"
|
||||
|
||||
17
config.toml
17
config.toml
@ -1,4 +1,3 @@
|
||||
parallel-jobs = 1
|
||||
logging-to-file = true # enables logging of every patch process to a seperate file
|
||||
enable-magisk-update = true # set this to false if you do not want to receive updates for the module in magisk app
|
||||
|
||||
@ -10,7 +9,7 @@ build-mode = "both" # 'both',
|
||||
excluded-patches = "" # space-seperated patches to exclude (multiline strings are not supported)
|
||||
included-patches = "" # space-seperated patches to include (non-excluded patches are included by default)
|
||||
version = "auto" # 'auto', 'latest', 'beta' or a custom one like '17.40.41'
|
||||
apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube/"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.youtube"
|
||||
|
||||
[Music-Extended]
|
||||
app-name = "Music"
|
||||
@ -19,7 +18,7 @@ integrations-source = "inotia00/revanced-integrations"
|
||||
cli-source = "inotia00/revanced-cli"
|
||||
rv-brand = "ReVanced Extended"
|
||||
build-mode = "both"
|
||||
apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube-music/"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.apps.youtube.music"
|
||||
apkmirror-arch = "both"
|
||||
|
||||
[YouTube-Extended]
|
||||
@ -29,26 +28,26 @@ integrations-source = "inotia00/revanced-integrations"
|
||||
cli-source = "inotia00/revanced-cli"
|
||||
rv-brand = "ReVanced Extended"
|
||||
build-mode = "both"
|
||||
apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube/"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.youtube"
|
||||
|
||||
[Music]
|
||||
build-mode = "both"
|
||||
apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube-music/"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.google.android.apps.youtube.music"
|
||||
apkmirror-arch = "both"
|
||||
|
||||
[Twitter]
|
||||
build-mode = "apk"
|
||||
uptodown-dlurl = "https://twitter.en.uptodown.com/android"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.twitter.android"
|
||||
|
||||
[Twitch]
|
||||
uptodown-dlurl = "https://twitch.en.uptodown.com/android"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/tv.twitch.android.app"
|
||||
|
||||
[TikTok]
|
||||
enabled = false
|
||||
uptodown-dlurl = "https://tiktok.en.uptodown.com/android"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.zhiliaoapp.musically"
|
||||
|
||||
[Reddit]
|
||||
uptodown-dlurl = "https://reddit-official-app.en.uptodown.com/android"
|
||||
archive-dlurl = "https://archive.org/download/jhc-apks/apks/com.reddit.frontpage"
|
||||
|
||||
[Lightroom]
|
||||
enabled = false
|
||||
|
||||
38
utils.sh
38
utils.sh
@ -293,6 +293,19 @@ dl_apkmonk() {
|
||||
}
|
||||
get_apkmonk_pkg_name() { grep -oP '.*apkmonk\.com\/app\/\K([,\w,\.]*)' <<<"$1"; }
|
||||
# --------------------------------------------------
|
||||
dl_archive() {
|
||||
local archive_resp=$1 version=$2 arch=$3 output=$4 url=$5
|
||||
local path
|
||||
path=$(grep "${version}-${arch}" <<<"$archive_resp") || return 1
|
||||
req "${url}/${path}" "$output"
|
||||
}
|
||||
get_archive_resp() {
|
||||
r=$(req "$1" -)
|
||||
if [ -z "$r" ]; then return 1; else sed -n 's;^<a href="\(.*\)"[^"]*;\1;p' <<<"$r"; fi
|
||||
}
|
||||
get_archive_vers() { sed 's/^[^-]*-//;s/-\(all\|arm64-v8a\|arm-v7a\)\.apk//g' <<<"$1"; }
|
||||
get_archive_pkg_name() { head -1 <<<"$1" | cut -d- -f1; }
|
||||
# --------------------------------------------------
|
||||
|
||||
patch_apk() {
|
||||
local stock_input=$1 patched_apk=$2 patcher_args=$3 rv_cli_jar=$4 rv_patches_jar=$5
|
||||
@ -324,7 +337,13 @@ build_rv() {
|
||||
p_patcher_args+=("$(join_args "${args[excluded_patches]}" -e) $(join_args "${args[included_patches]}" -i)")
|
||||
[ "${args[exclusive_patches]}" = true ] && p_patcher_args+=("--exclusive")
|
||||
|
||||
if [ "$dl_from" = apkmirror ]; then
|
||||
if [ "$dl_from" = archive ]; then
|
||||
if ! archive_resp=$(get_archive_resp "${args[archive_dlurl]}"); then
|
||||
epr "Could not find ${args[archive_dlurl]}"
|
||||
return 0
|
||||
fi
|
||||
pkg_name=$(get_archive_pkg_name "$archive_resp")
|
||||
elif [ "$dl_from" = apkmirror ]; then
|
||||
pkg_name=$(get_apkmirror_pkg_name "${args[apkmirror_dlurl]}")
|
||||
elif [ "$dl_from" = uptodown ]; then
|
||||
uptwod_resp_dl=$(req "${args[uptodown_dlurl]}/download" -)
|
||||
@ -349,7 +368,10 @@ build_rv() {
|
||||
p_patcher_args+=("-f")
|
||||
fi
|
||||
if [ $get_latest_ver = true ]; then
|
||||
if [ "$dl_from" = apkmirror ]; then
|
||||
if [ "$dl_from" = archive ]; then
|
||||
archivevers=$(get_archive_vers "$archive_resp")
|
||||
version=$(get_largest_ver <<<"$archivevers") || version=$(head -1 <<<"$archivevers")
|
||||
elif [ "$dl_from" = apkmirror ]; then
|
||||
local apkmvers aav
|
||||
if [ "$version_mode" = beta ]; then aav="true"; else aav="false"; fi
|
||||
apkmvers=$(get_apkmirror_vers "${args[apkmirror_dlurl]##*/}" "$aav")
|
||||
@ -371,8 +393,16 @@ build_rv() {
|
||||
version_f=${version_f#v}
|
||||
local stock_apk="${TEMP_DIR}/${pkg_name}-${version_f}-${arch_f}.apk"
|
||||
if [ ! -f "$stock_apk" ]; then
|
||||
for dl_p in apkmirror uptodown apkmonk; do
|
||||
if [ "$dl_p" = apkmirror ]; then
|
||||
for dl_p in archive apkmirror uptodown apkmonk; do
|
||||
if [ "$dl_p" = archive ]; then
|
||||
if [ -z "${args[archive_dlurl]}" ]; then continue; fi
|
||||
pr "Downloading '${table}' from j-hc archive"
|
||||
if ! dl_archive "$archive_resp" "$version_f" "$arch_f" "$stock_apk" "${args[archive_dlurl]}"; then
|
||||
epr "ERROR: Could not download ${table} from j-hc archive"
|
||||
continue
|
||||
fi
|
||||
break
|
||||
elif [ "$dl_p" = apkmirror ]; then
|
||||
if [ -z "${args[apkmirror_dlurl]}" ]; then continue; fi
|
||||
pr "Downloading '${table}' from APKMirror"
|
||||
local apkm_arch
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user