nezumi/revanced-apk-build
1
0
Fork 0
mirror of https://github.com/Nezumi-2711/revanced-apk-build.git synced 2026-09-22 13:38:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: apk download

Browse Source
This commit is contained in:
Nezumi-2711
2026-03-17 09:55:23 +07:00
parent ffa6e7a357
commit f0b44a12a1
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.sh
-7
View File
@@ -67,7 +67,6 @@ for table_name in $(toml_get_table_names); do
vtf "$enabled" "enabled" vtf "$enabled" "enabled"
if [ "$enabled" = false ]; then continue; fi if [ "$enabled" = false ]; then continue; fi
if ((idx >= PARALLEL_JOBS)); then if ((idx >= PARALLEL_JOBS)); then
echo "[DEBUG] wait -n at top of loop for $table_name" >&2
wait -n wait -n
idx=$((idx - 1)) idx=$((idx - 1))
fi fi
@@ -81,7 +80,6 @@ for table_name in $(toml_get_table_names); do
if ! RVP="$(get_rv_prebuilts "$cli_src" "$cli_ver" "$patches_src" "$patches_ver")"; then if ! RVP="$(get_rv_prebuilts "$cli_src" "$cli_ver" "$patches_src" "$patches_ver")"; then
abort "could not download rv prebuilts" abort "could not download rv prebuilts"
fi fi
echo "[DEBUG] get_rv_prebuilts done for $table_name, RVP='$RVP'" >&2
read -r rv_cli_jar rv_patches_jar <<<"$RVP" read -r rv_cli_jar rv_patches_jar <<<"$RVP"
app_args[cli]=$rv_cli_jar app_args[cli]=$rv_cli_jar
app_args[ptjar]=$rv_patches_jar app_args[ptjar]=$rv_patches_jar
@@ -95,7 +93,6 @@ for table_name in $(toml_get_table_names); do
fi fi
fi fi
if [ "${app_args[riplib]}" = "true" ] && [ "$(toml_get "$t" riplib)" = "false" ]; then app_args[riplib]=false; fi if [ "${app_args[riplib]}" = "true" ] && [ "$(toml_get "$t" riplib)" = "false" ]; then app_args[riplib]=false; fi
echo "[DEBUG] riplib check done for $table_name, riplib=${app_args[riplib]}" >&2
app_args[rv_brand]=$(toml_get "$t" rv-brand) || app_args[rv_brand]=$DEF_RV_BRAND app_args[rv_brand]=$(toml_get "$t" rv-brand) || app_args[rv_brand]=$DEF_RV_BRAND
app_args[excluded_patches]=$(toml_get "$t" excluded-patches) || app_args[excluded_patches]="" app_args[excluded_patches]=$(toml_get "$t" excluded-patches) || app_args[excluded_patches]=""
@@ -144,13 +141,11 @@ for table_name in $(toml_get_table_names); do
module_prop_name_b=${app_args[module_prop_name]} module_prop_name_b=${app_args[module_prop_name]}
app_args[module_prop_name]="${module_prop_name_b}-arm64" app_args[module_prop_name]="${module_prop_name_b}-arm64"
idx=$((idx + 1)) idx=$((idx + 1))
echo "[DEBUG] Launching build_rv for $table_name (arm64-v8a)" >&2
build_rv "$(declare -p app_args)" & build_rv "$(declare -p app_args)" &
app_args[table]="$table_name (arm-v7a)" app_args[table]="$table_name (arm-v7a)"
app_args[arch]="arm-v7a" app_args[arch]="arm-v7a"
app_args[module_prop_name]="${module_prop_name_b}-arm" app_args[module_prop_name]="${module_prop_name_b}-arm"
if ((idx >= PARALLEL_JOBS)); then if ((idx >= PARALLEL_JOBS)); then
echo "[DEBUG] wait -n for parallel job limit" >&2
wait -n wait -n
idx=$((idx - 1)) idx=$((idx - 1))
fi fi
@@ -163,11 +158,9 @@ for table_name in $(toml_get_table_names); do
app_args[module_prop_name]="${app_args[module_prop_name]}-arm" app_args[module_prop_name]="${app_args[module_prop_name]}-arm"
fi fi
idx=$((idx + 1)) idx=$((idx + 1))
echo "[DEBUG] Launching build_rv for $table_name" >&2
build_rv "$(declare -p app_args)" & build_rv "$(declare -p app_args)" &
fi fi
done done
echo "[DEBUG] All build_rv launched, waiting..." >&2
wait wait
rm -rf temp/tmp.* rm -rf temp/tmp.*
if [ -z "$(ls -A1 "${BUILD_DIR}")" ]; then abort "All builds failed."; fi if [ -z "$(ls -A1 "${BUILD_DIR}")" ]; then abort "All builds failed."; fi
utils.sh
+1 -2
View File
@@ -481,7 +481,7 @@ dl_archive() {
} }
get_archive_resp() { get_archive_resp() {
local r local r
r=$(req "$1" -) r=$(req "$1" -) || return 1
if [ -z "$r" ]; then return 1; else __ARCHIVE_RESP__=$(sed -n 's;^<a href="\(.*\)"[^"]*;\1;p' <<<"$r"); fi if [ -z "$r" ]; then return 1; else __ARCHIVE_RESP__=$(sed -n 's;^<a href="\(.*\)"[^"]*;\1;p' <<<"$r"); fi
__ARCHIVE_PKG_NAME__=$(awk -F/ '{print $NF}' <<<"$1") __ARCHIVE_PKG_NAME__=$(awk -F/ '{print $NF}' <<<"$1")
} }
@@ -523,7 +523,6 @@ check_sig() {
build_rv() { build_rv() {
eval "declare -A args=${1#*=}" eval "declare -A args=${1#*=}"
echo "[DEBUG] build_rv entered for ${args[table]}" >&2
local version="" pkg_name="" local version="" pkg_name=""
local mode_arg=${args[build_mode]} version_mode=${args[version]} local mode_arg=${args[build_mode]} version_mode=${args[version]}
local app_name=${args[app_name]} local app_name=${args[app_name]}