diff --git a/action.sh b/action.sh index 65d5c00..754c59f 100755 --- a/action.sh +++ b/action.sh @@ -188,9 +188,9 @@ get_apkmirror_pkg_name() { req "$1" - | sed -n 's;.*id=\(.*\)" class="accent_col # -------------------------------------------------- patch_apk() { - local stock_input=$1 patched_apk=$2 patcher_args=$3 rv_cli_jar=$4 rv_patches_jar=$5 + local stock_input=$1 patched_apk=$2 patcher_args=$3 rv_cli_jar=$4 rv_patches_jar=$5 rv_integ_apk=$6 declare -r tdir=$(mktemp -d -p $TEMP_DIR) - local cmd="java -jar $rv_cli_jar --rip-lib x86_64 --rip-lib x86 --temp-dir=$tdir -c -a $stock_input -o $patched_apk -b $rv_patches_jar --keystore=revanced.keystore $patcher_args" + local cmd="java -jar $rv_cli_jar patch -b $rv_patches_jar -m $rv_integ_apk -o $patched_apk -r $tdir -p --rip-lib x86_64 --rip-lib x86 --keystore=revanced.keystore $patcher_args $stock_input" pr "$cmd" if [ "${DRYRUN:-}" = true ]; then cp -f "$stock_input" "$patched_apk" @@ -267,7 +267,6 @@ build_rv() { fi log "${table}: ${version}" - if [ "${args[merge_integrations]}" = true ]; then p_patcher_args+=("-m ${args[integ]}"); fi local microg_patch microg_patch=$(jq -r ".[] | select(.compatiblePackages[].name==\"${pkg_name}\") | .name" "${args[ptjs]}" | grep -iF microg || :) if [ "$microg_patch" ]; then @@ -292,7 +291,7 @@ build_rv() { patched_apk="${TEMP_DIR}/${app_name_l}-${rv_brand_f}-${version_f}-${arch_f}.apk" fi if [ ! -f "$patched_apk" ] || [ "$REBUILD" = true ]; then - if ! patch_apk "$stock_apk" "$patched_apk" "${patcher_args[*]}" "${args[cli]}" "${args[ptjar]}"; then + if ! patch_apk "$stock_apk" "$patched_apk" "${patcher_args[*]}" "${args[cli]}" "${args[ptjar]}" "${args[integ]}"; then epr "Building '${table}' failed!" return 0 fi diff --git a/config.toml b/config.toml index 3be97e9..19ae7b7 100755 --- a/config.toml +++ b/config.toml @@ -2,7 +2,7 @@ build-mode = "apk" patches-source = "revanced/revanced-patches" integrations-source = "revanced/revanced-integrations" -cli-source = "j-hc/revanced-cli" +cli-source = "rahulkhatri137/revanced-cli" excluded-patches = "" included-patches = "" version = "auto" @@ -12,7 +12,7 @@ apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube/" app-name = "YouTube" patches-source = "YT-Advanced/ReX-patches" integrations-source = "YT-Advanced/ReX-integrations" -cli-source = "inotia00/revanced-cli" +cli-source = "rahulkhatri137/revanced-cli" rv-brand = "ReVanced Extended" build-mode = "apk" apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube/" @@ -21,7 +21,7 @@ apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube/" build-mode = "apk" patches-source = "revanced/revanced-patches" integrations-source = "revanced/revanced-integrations" -cli-source = "j-hc/revanced-cli" +cli-source = "rahulkhatri137/revanced-cli" excluded-patches = "" apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube-music/" apkmirror-arch = "arm64-v8a" @@ -30,7 +30,7 @@ apkmirror-arch = "arm64-v8a" app-name = "Music" patches-source = "YT-Advanced/ReX-patches" integrations-source = "YT-Advanced/ReX-integrations" -cli-source = "inotia00/revanced-cli" +cli-source = "rahulkhatri137/revanced-cli" rv-brand = "ReVanced Extended" build-mode = "apk" apkmirror-dlurl = "https://www.apkmirror.com/apk/google-inc/youtube-music/"