diff --git a/CONFIG.md b/CONFIG.md index 31fb00e..edd117e 100755 --- a/CONFIG.md +++ b/CONFIG.md @@ -39,7 +39,6 @@ apkmirror-dlurl = "https://www.apkmirror.com/apk/inc/app" uptodown-dlurl = "https://spotify.en.uptodown.com/android" apkmonk-dlurl = "https://www.apkmonk.com/app/com.app.app/" module-prop-name = "some-app-magisk" # magisk module prop name. -merge-integrations = false # set false to never merge even when needed. default: true apkmirror-dpi = "360-480dpi" # used to select apk variant from apkmirror. default: nodpi arch = "arm64-v8a" # 'arm64-v8a', 'arm-v7a', 'all', 'both'. 'both' downloads both arm64-v8a and arm-v7a. default: all ``` diff --git a/build.sh b/build.sh index c4040d8..4850687 100755 --- a/build.sh +++ b/build.sh @@ -19,7 +19,6 @@ COMPRESSION_LEVEL=$(toml_get "$main_config_t" compression-level) || COMPRESSION_ if ! PARALLEL_JOBS=$(toml_get "$main_config_t" parallel-jobs); then if [ "$OS" = Android ]; then PARALLEL_JOBS=1; else PARALLEL_JOBS=$(nproc); fi fi -LOGGING_F=$(toml_get "$main_config_t" logging-to-file) && vtf "$LOGGING_F" "logging-to-file" || LOGGING_F=false DEF_PATCHES_VER=$(toml_get "$main_config_t" patches-version) || DEF_PATCHES_VER="" DEF_INTEGRATIONS_VER=$(toml_get "$main_config_t" integrations-version) || DEF_INTEGRATIONS_VER="" DEF_CLI_VER=$(toml_get "$main_config_t" cli-version) || DEF_CLI_VER="" @@ -43,7 +42,6 @@ fi # ----------------- if ((COMPRESSION_LEVEL > 9)) || ((COMPRESSION_LEVEL < 0)); then abort "compression-level must be within 0-9"; fi -if [ "$LOGGING_F" = true ]; then mkdir -p logs; fi # -- check_deps -- jq --version >/dev/null || abort "\`jq\` is not installed. install it with 'apt install jq' or equivalent" @@ -66,16 +64,6 @@ set_prebuilts() { app_args[ptjs]=$(find "${TEMP_DIR}/${patches_dir,,}-rv" -name "patches-${patches_ver:-*}.json" -type f -print -quit 2>/dev/null) && [ "${app_args[ptjs]}" ] || return 1 } -build_rv_w() { - if [ "$LOGGING_F" = true ]; then - logf=logs/"${table_name,,}.log" - : >"$logf" - { build_rv 2>&1 "$(declare -p app_args)" | tee "$logf"; } & - else - build_rv "$(declare -p app_args)" & - fi -} - declare -A cliriplib idx=0 for table_name in $(toml_get_table_names); do @@ -152,7 +140,6 @@ for table_name in $(toml_get_table_names); do fi app_args[include_stock]=$(toml_get "$t" include-stock) || app_args[include_stock]=true && vtf "${app_args[include_stock]}" "include-stock" - app_args[merge_integrations]=$(toml_get "$t" merge-integrations) || app_args[merge_integrations]=true && vtf "${app_args[merge_integrations]}" "merge-integrations" app_args[dpi]=$(toml_get "$t" apkmirror-dpi) || app_args[dpi]="nodpi" table_name_f=${table_name,,} table_name_f=${table_name_f// /-} @@ -163,16 +150,16 @@ for table_name in $(toml_get_table_names); do app_args[module_prop_name]="${app_args[module_prop_name]}-arm64" app_args[arch]="arm64-v8a" idx=$((idx + 1)) - build_rv_w + build_rv "$(declare -p app_args)" & app_args[table]="$table_name (arm-v7a)" app_args[module_prop_name]="${app_args[module_prop_name]}-arm" app_args[arch]="arm-v7a" if ((idx >= PARALLEL_JOBS)); then wait -n; fi idx=$((idx + 1)) - build_rv_w + build_rv "$(declare -p app_args)" & else idx=$((idx + 1)) - build_rv_w + build_rv "$(declare -p app_args)" & fi done wait diff --git a/config.toml b/config.toml index 7746323..473a942 100755 --- a/config.toml +++ b/config.toml @@ -1,4 +1,3 @@ -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 # add 'enabled = false' for not patching a specific app or remove it from the config diff --git a/utils.sh b/utils.sh index d29a84a..a159faf 100755 --- a/utils.sh +++ b/utils.sh @@ -409,7 +409,7 @@ build_rv() { fi log "${table}: ${version}" - if [ "${args[merge_integrations]}" = true ]; then p_patcher_args+=("-m ${args[integ]}"); fi + p_patcher_args+=("-m ${args[integ]}") local microg_patch microg_patch=$(jq -r ".[] | select(.compatiblePackages // [] | .[] | .name==\"${pkg_name}\") | .name" "${args[ptjs]}" | grep -i "gmscore\|microg" || :) if [ -n "$microg_patch" ] && [[ ${p_patcher_args[*]} =~ $microg_patch ]]; then