diff --git a/src/build/Revanced-Beta.sh b/src/build/Revanced-Beta.sh index ae91fb6..2d921ea 100644 --- a/src/build/Revanced-Beta.sh +++ b/src/build/Revanced-Beta.sh @@ -66,7 +66,6 @@ revanced_dl(){ # Patch Instagram: # Arm64-v8a get_patches_key "instagram" - version="360.0.0.52.192" get_apk "com.instagram.android" "instagram-arm64-v8a-beta" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi" patch "instagram-arm64-v8a-beta" "revanced" } diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 0e3f8d2..036435e 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -65,7 +65,6 @@ revanced_dl(){ # Patch Instagram: # Arm64-v8a get_patches_key "instagram" - version="360.0.0.52.192" get_apk "com.instagram.android" "instagram-arm64-v8a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" "nodpi" patch "instagram-arm64-v8a" "revanced" } diff --git a/src/build/utils.sh b/src/build/utils.sh index 543f296..beb812a 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -155,6 +155,9 @@ dl_apk() { url="https://www.apkmirror.com$(req "$url" - | grep -oP 'id="download-link".*?href="\K[^"]+')" #url="https://www.apkmirror.com$(req "$url" - | $pup -p --charset utf-8 'a.downloadButton attr{href}')" #url="https://www.apkmirror.com$(req "$url" - | $pup -p --charset utf-8 'a#download-link attr{href}')" + if [[ "$url" == "https://www.apkmirror.com" ]]; then + exit 0 + fi req "$url" "$output" } get_apk() { @@ -182,6 +185,32 @@ get_apk() { fi fi export version="$version" + if [[ -n "$version" ]]; then + version=$(echo "$version" | tr -d ' ' | sed 's/\./-/g') + green_log "[+] Downloading $3 version: $version $5 $6 $7" + if [[ $5 == "Bundle" ]] || [[ $5 == "Bundle_extract" ]]; 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" \ + "$5") + if [[ -f "./download/$base_apk" ]]; then + green_log "[+] Successfully downloaded $2" + else + red_log "[-] Failed to download $2" + exit 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 + elif [[ $5 == "Bundle_extract" ]]; then + unzip "./download/$base_apk" -d "./download/$(basename "$base_apk" .apkm)" > /dev/null 2>&1 + fi + return 0 + fi local attempt=0 while [ $attempt -lt 10 ]; do if [[ -z $version ]] || [ $attempt -ne 0 ]; then