diff --git a/.github/workflows/patch.yml b/.github/workflows/patch.yml index c783f65..c896f37 100644 --- a/.github/workflows/patch.yml +++ b/.github/workflows/patch.yml @@ -29,6 +29,7 @@ jobs: | wget -qi - YT-RVVERSION=$(jq -r '.[] | select(.name == "microg-support") | .compatiblePackages[] | select(.name == "com.google.android.youtube") | .versions[-1]' patches.json) rm -rf patches.json + curl -s https://api.github.com/repos/inotia00/revanced-patches/releases/latest \ | grep "browser_download_url.*json" \ | cut -d : -f 2,3 \ @@ -44,6 +45,7 @@ jobs: | wget -qi - YTM-RVVERSION=$(jq -r '.[] | select(.name == "microg-support") | .compatiblePackages[] | select(.name == "com.google.android.apps.youtube.music") | .versions[-1]' patches.json) rm -rf patches.json + curl -s https://api.github.com/repos/inotia00/revanced-patches/releases/latest \ | grep "browser_download_url.*json" \ | cut -d : -f 2,3 \ diff --git a/yt/patch-yt.sh b/yt/patch-yt.sh index 0e9f8db..642c559 100644 --- a/yt/patch-yt.sh +++ b/yt/patch-yt.sh @@ -3,12 +3,12 @@ set -e # Set variables for Revanced readonly revanced_name="revanced" readonly revanced_user="revanced" -readonly revanced_patch="patches-yt.rv" +readonly revanced_patch="yt/patches-yt.rv" readonly revanced_ytversion="" # Input version supported if you need patch specific YT version.Example: "18.03.36" # Set variables for Revanced Extended readonly revanced_extended_name="revanced-extended" readonly revanced_extended_user="inotia00" -readonly revanced_extended_patch="patches-yt.rve" +readonly revanced_extended_patch="yt/patches-yt.rve" readonly revanced_extended_ytversion="" # Input version supported if you need patch specific YT version.Example: "18.07.35" # Function prepare patches keywords get_patch() { diff --git a/ytm/patch-ytm.sh b/ytm/patch-ytm.sh index c33a962..cc74ccf 100644 --- a/ytm/patch-ytm.sh +++ b/ytm/patch-ytm.sh @@ -3,12 +3,12 @@ set -e # Set variables for Revanced readonly revanced_name="revanced" readonly revanced_user="revanced" -readonly revanced_patch="/ytm/patches-ytm.rv" +readonly revanced_patch="ytm/patches-ytm.rv" readonly revanced_ytmsversion="" # Input version supported if you need patch specific YT version.Example: "18.03.36" # Set variables for Revanced Extended readonly revanced_extended_name="revanced-extended" readonly revanced_extended_user="inotia00" -readonly revanced_extended_patch="/ytm/patches-ytm.rve" +readonly revanced_extended_patch="ytm/patches-ytm.rve" readonly revanced_extended_ytmsversion="" # Input version supported if you need patch specific YT version.Example: "18.07.35" # Function prepare patches keywords get_patch() { @@ -42,7 +42,7 @@ req() { } dl_ytm() { rm -rf $2 - echo "Downloading YouTubeMusic $1" + echo "Downloading YouTube Music $1" url="https://www.apkmirror.com/apk/google-inc/youtube/youtube-music-${1//./-}-release/" url="$url$(req "$url" - | grep arm64 -A30 | grep youtube-music | head -1 | sed "s#.*-release/##g;s#/\".*##g")" url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n 's;.*href="\(.*key=[^"]*\)">.*;\1;p')" @@ -52,14 +52,14 @@ dl_ytm() { get_latestytmversion() { url="https://www.apkmirror.com/apk/google-inc/youtube-music/" ytmsversion=$(req "$url" - | grep "All version" -A200 | grep app_release | sed 's:.*/youtube-music-::g;s:-release/.*::g;s:-:.:g' | sort -r | head -1) - echo "Latest YoutubeMusic Version: $ytmsversion" + echo "Latest Youtube Music Version: $ytmsversion" } get_support_version() { ytmsversion=$(jq -r '.[] | select(.name == "hide-get-premium") | .compatiblePackages[] | select(.name == "com.google.android.apps.youtube.music") | .versions[-1]' patches.json) } # Function Patch APK -patch_apk() { -echo "⚙️ Patching YouTube..." +patch_ms() { +echo "⚙️ Patching YouTube Music..." java -jar revanced-cli*.jar \ -m revanced-integrations*.apk \ -b revanced-patches*.jar \ @@ -76,7 +76,7 @@ rm -f revanced-cli*.jar \ revanced-patches*.jar \ patches.json \ options.toml \ - youtube*.apk \ + youtube-music*.apk \ } # Loop over Revanced & Revanced Extended for name in $revanced_name $revanced_extended_name ; do @@ -88,16 +88,16 @@ for name in $revanced_name $revanced_extended_name ; do else user="$revanced_extended_user" patch_file="$revanced_extended_patch" - ytmsversion="$revanced_extended_ytmsversion" + ytmsversion="$revanced_extended_ytmsversion" fi get_patch download_latest_release -if [[ "$name" = "$revanced_name" ]] ; then - get_support_version - dl_ytm $ytmsversion youtube-music-v$ytmsversion.apk - else get_latestytmversion + if [[ "$name" = "$revanced_name" ]] ; then + get_support_version + dl_ytm $ytmsversion youtube-music-v$ytmsversion.apk + else get_latestytmversion dl_ytm $ytmsversion youtube-music-v$ytmsversion.apk fi -patch_apk +patch_ms clean_cache done \ No newline at end of file