diff --git a/README.md b/README.md index 2525a39..1daa032 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,14 @@ # Download Revanced -[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/total?style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest/download/yt-revanced.apk) +[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/Revanced/total?style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/Revanced/yt-revanced.apk) Revanced Extended -[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/total?style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/latest/download/yt-revanced-extended.apk) +[![Release](https://img.shields.io/github/downloads/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/Revanced-Extended/total?style=for-the-badge)](https://github.com/FiorenMas/Revanced-And-Revanced-Extended-Non-Root/releases/download/Revanced-Extended/yt-revanced-extended.apk) # Download MicroG from inotia00 source [![Release](https://img.shields.io/github/v/release/inotia00/VancedMicroG.svg)](https://github.com/inotia00/VancedMicroG/releases/latest/download/microg.apk) # About This repository forked from [@luxysiv](https://github.com/luxysiv/yt-revanced-extended) - -GitHub Workflow Status diff --git a/patch.sh b/patch.sh index dc9e78d..b9d4954 100644 --- a/patch.sh +++ b/patch.sh @@ -1,25 +1,22 @@ #!/bin/bash # Config to patch Revanced and Revanced Extended -# Input YTVERSION number of version/blank to select specific/auto select YouTube version supported # Revanced cat > keywords.rv << EOF NAME="revanced" -USER="revanced" +ORG="revanced" PATCH="patches.rv" -YTVERSION="18.03.36" EOF # Revanced Extended cat > keywords.rve << EOF NAME="revanced-extended" -USER="inotia00" +ORG="inotia00" PATCH="patches.rve" -#YTVERSION="18.07.35" EOF -#for var in keywords.rv # Revanced -#for var in keywords.rve # Revanced Extended +# for var in keywords.rv # Revanced +# for var in keywords.rve # Revanced Extended for var in keywords.rv keywords.rve # Both do source $var @@ -66,15 +63,15 @@ echo -e "⏬ Prepairing $NAME resources..." IFS=$' \t\r\n' # Patches & json -latest_patches=$(curl -s https://api.github.com/repos/$USER/revanced-patches/releases/latest \ +latest_patches=$(curl -s https://api.github.com/repos/$ORG/revanced-patches/releases/latest \ | jq -r '.assets[].browser_download_url') # Cli -latest_cli=$(curl -s https://api.github.com/repos/$USER/revanced-cli/releases/latest \ +latest_cli=$(curl -s https://api.github.com/repos/$ORG/revanced-cli/releases/latest \ | jq -r '.assets[].browser_download_url') # Integrations -latest_integrations=$(curl -s https://api.github.com/repos/$USER/revanced-integrations/releases/latest \ +latest_integrations=$(curl -s https://api.github.com/repos/$ORG/revanced-integrations/releases/latest \ | jq -r '.assets[].browser_download_url') # Download all resources @@ -82,8 +79,11 @@ for asset in $latest_patches $latest_cli $latest_integrations ; do curl -s -OL $asset done -# Download YouTube APK supported -WGET_HEADER="User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:111.0) Gecko/20100101 Firefox/111.0" +# Fetch latest supported YT versions +YTVERSION=$(jq -r '.[] | select(.name == "microg-support") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json) + +# Download latest APK supported +WGET_HEADER="User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Firefox/102.0" req() { wget -q -O "$2" --header="$WGET_HEADER" "$1" @@ -107,13 +107,8 @@ dl_yt() { req "$url" "$2" } -# Download specific or auto choose Youtube version -if [ $YTVERSION ] ; - then - dl_yt $YTVERSION youtube-v$YTVERSION.apk - else YTVERSION=$(jq -r '.[] | select(.name == "microg-support") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json) - dl_yt $YTVERSION youtube-v$YTVERSION.apk -fi +# Download Youtube +dl_yt $YTVERSION youtube-v$YTVERSION.apk # Patch APK echo -e "⚙️ Patching YouTube..." @@ -132,9 +127,9 @@ rm -f revanced-cli*.jar \ revanced-patches*.jar \ patches.json \ options.toml \ - youtube*.apk \ + youtube*.apk \ -unset patches +unset patches # Finish done