fix: resolve the issues

This commit is contained in:
2026-05-15 11:08:20 +07:00
parent c48c4abc17
commit d7a7688aa8
17 changed files with 298 additions and 189 deletions
+9 -4
View File
@@ -33,7 +33,6 @@ DEF_CLI_VER=$(toml_get "$main_config_t" cli-version) || DEF_CLI_VER="latest"
DEF_PATCHES_SRC=$(toml_get "$main_config_t" patches-source) || DEF_PATCHES_SRC="ReVanced/revanced-patches"
DEF_CLI_SRC=$(toml_get "$main_config_t" cli-source) || DEF_CLI_SRC="ReVanced/revanced-cli"
DEF_RV_BRAND=$(toml_get "$main_config_t" rv-brand) || DEF_RV_BRAND="ReVanced"
DEF_DPI_LIST=$(toml_get "$main_config_t" dpi) || DEF_DPI_LIST="nodpi anydpi"
mkdir -p "$TEMP_DIR" "$BUILD_DIR"
if [ "${2-}" = "--config-update" ]; then
@@ -101,6 +100,11 @@ for table_name in $(toml_get_table_names); do
abort "ERROR: build-mode '${app_args[build_mode]}' is not a valid option for '${table_name}': only 'both', 'apk' or 'module' is allowed"
fi
} || app_args[build_mode]=apk
app_args[include_stock]=$(toml_get "$t" include-stock) && {
if ! isoneof "${app_args[include_stock]}" disable merged split; then
abort "ERROR: include-stock '${app_args[include_stock]}' is not a valid option for '${table_name}': only 'disable', 'merged' or 'split' is allowed"
fi
} || app_args[include_stock]=merged
for dl_from in "${DL_SRCS[@]}"; do
if app_args[${dl_from}_dlurl]=$(toml_get "$t" "${dl_from}-dlurl"); then
@@ -118,8 +122,8 @@ for table_name in $(toml_get_table_names); do
abort "wrong arch '${app_args[arch]}' for '$table_name'"
fi
app_args[include_stock]=$(toml_get "$t" include-stock) || app_args[include_stock]=true && vtf "${app_args[include_stock]}" "include-stock"
app_args[dpi]=$(toml_get "$t" dpi) || app_args[dpi]="$DEF_DPI_LIST"
app_args[pkg_name]=$(toml_get "$t" pkg-name) || app_args[pkg_name]=""
app_args[dpi]=$(toml_get "$t" dpi) || app_args[dpi]=""
table_name_f=${table_name,,}
table_name_f=${table_name_f// /-}
app_args[module_prop_name]=$(toml_get "$t" module-prop-name) || app_args[module_prop_name]="${table_name_f}-jhc"
@@ -154,8 +158,9 @@ wait
rm -rf temp/tmp.*
if [ -z "$(ls -A1 "${BUILD_DIR}")" ]; then abort "All builds failed."; fi
log "\nInstall [MicroG-RE](https://github.com/MorpheApp/MicroG-RE/releases) for non-root YouTube and YT Music APKs"
log "\nInstall [Microg](https://github.com/ReVanced/GmsCore/releases) for non-root YouTube and YT Music APKs"
log "Use [zygisk-detach](https://github.com/j-hc/zygisk-detach) to detach YouTube and YT Music modules from Play Store"
log "\n[revanced-magisk-module](https://github.com/j-hc/revanced-magisk-module)\n"
log "$(cat "$TEMP_DIR"/*/changelog.md)"
SKIPPED=$(cat "$TEMP_DIR"/skipped 2>/dev/null || :)