diff --git a/README.md b/README.md index b35e9b6..09d8f9d 100644 --- a/README.md +++ b/README.md @@ -415,6 +415,8 @@ Download [Markdown Badges](https://github.com/Ileriayo/markdown-badges) - [MIT](https://github.com/Ileriayo/markdown-badges/blob/master/LICENSE) +[HTMLQ](https://github.com/mgdm/htmlq) - [MIT](https://github.com/mgdm/htmlq/blob/master/LICENSE.md) +[APKEditor](https://github.com/REAndroid/APKEditor) - [Apache-2.0](https://github.com/REAndroid/APKEditor/blob/master/LICENSE) --- diff --git a/src/build/Piko.sh b/src/build/Piko.sh index 7472b74..f292b3d 100644 --- a/src/build/Piko.sh +++ b/src/build/Piko.sh @@ -13,7 +13,7 @@ patch_piko () { v="prerelease" apk_name="beta" fi dl_gh "piko revanced-integrations" "crimera" "$v" - get_apk "com.twitter.android" "twitter-$apk_name" "twitter" "x-corp/twitter/twitter" + get_apk "com.twitter.android" "twitter-$apk_name" "twitter" "x-corp/twitter/twitter" "Bundle" patch "twitter-$apk_name" "piko" } patch_piko $1 \ No newline at end of file diff --git a/src/build/Revanced-2.sh b/src/build/Revanced-2.sh index f904a68..d11d408 100644 --- a/src/build/Revanced-2.sh +++ b/src/build/Revanced-2.sh @@ -11,7 +11,7 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest" # Patch Twitter: get_patches_key "twitter" -get_apk "com.twitter.android" "twitter" "twitter" "x-corp/twitter/twitter" +get_apk "com.twitter.android" "twitter" "twitter" "x-corp/twitter/twitter" "Bundle" patch "twitter" "revanced" ################################################# diff --git a/src/build/Revanced-Beta-2.sh b/src/build/Revanced-Beta-2.sh index 293c889..f2dc085 100644 --- a/src/build/Revanced-Beta-2.sh +++ b/src/build/Revanced-Beta-2.sh @@ -12,7 +12,7 @@ dl_gh "revanced-cli" "revanced" "latest" # Patch Twitter: get_patches_key "twitter" -get_apk "com.twitter.android" "twitter-beta" "twitter" "x-corp/twitter/twitter" +get_apk "com.twitter.android" "twitter-beta" "twitter" "x-corp/twitter/twitter" "Bundle" patch "twitter-beta" "revanced" ################################################# diff --git a/src/build/utils.sh b/src/build/utils.sh index faca182..a154030 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -2,10 +2,13 @@ mkdir ./release ./download -#Setup HTMLQ +#Setup HTMLQ for download apk files wget -q -O ./htmlq.tar.gz https://github.com/mgdm/htmlq/releases/latest/download/htmlq-x86_64-linux.tar.gz tar -xf "./htmlq.tar.gz" -C "./" HTMLQ="./htmlq" +#Setup APKEditor for install combine split apks +wget -q -O ./APKEditor.jar https://github.com/REAndroid/APKEditor/releases/download/V1.3.9/APKEditor-1.3.9.jar +APKEditor="./APKEditor.jar" ################################################# @@ -124,6 +127,8 @@ dl_apk() { get_apk() { if [[ -z $5 ]]; then url_regexp='APK[^@]*@\([^#]*\)' + elif [[ $5 == "Bundle" ]]; then + url_regexp='BUNDLE[^@]*@\([^#]*\)' else case $5 in arm64-v8a) url_regexp='arm64-v8a'"[^@]*$7"''"[^@]*$6"'[^@]*@\([^"]*\)' ;; @@ -150,11 +155,15 @@ get_apk() { version=$(echo -e "${_versions[*]}" | sed -n "$((attempt + 1))p") fi green_log "[+] Downloading $3 version: $version $5 $6 $7" - local base_apk="$2.apk" + if [[ $5 == "Bundle" ]]; then + local base_apk="$2.apkm" + else + local base_apk="$2.apk" + fi local dl_url=$(dl_apk "https://www.apkmirror.com/apk/$4-${version//./-}-release/" \ "$url_regexp" \ "$base_apk") - if [[ -f "./download/$2.apk" ]]; then + if [[ -f "./download/$base_apk" ]]; then green_log "[+] Successfully downloaded $2" break else @@ -167,6 +176,10 @@ get_apk() { red_log "[-] No more versions to try. Failed download" return 1 fi + if [[ $5 == "Bundle" ]]; then + green_log "[+] Merge splits apk to standalone apk" + java -jar $APKEditor m -i ./download/$2.apkm -o ./download/$2.apk > /dev/null 2>&1 + fi } ################################################# @@ -237,4 +250,4 @@ split_arch() { exit 1 fi } -################################################# +################################################# \ No newline at end of file