From 80222a9fa964e40689c7d604c651e541845a183a Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Sat, 28 Oct 2023 11:38:03 +0700 Subject: [PATCH] bump compatibility latest rve-cli --- src/build/Revanced-Extended.sh | 17 +++---- src/build/utils.sh | 33 ++++++++------ .../exclude-patches | 24 +++++----- .../youtube-revanced-extended/exclude-patches | 44 ++++++++----------- src/patches/youtube-revanced/exclude-patches | 23 ++++------ 5 files changed, 68 insertions(+), 73 deletions(-) diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh index d3158f9..f505413 100644 --- a/src/build/Revanced-Extended.sh +++ b/src/build/Revanced-Extended.sh @@ -10,8 +10,7 @@ checker "inotia00/revanced-patches" "revanced-extended" ################################################# # Download requirements -dl_gh "revanced-patches revanced-integrations" "inotia00" "latest" -dl_gh "revanced-cli" "revanced" "latest" +dl_gh "revanced-patches revanced-integrations revanced-cli" "inotia00" "latest" ################################################# @@ -19,28 +18,30 @@ dl_gh "revanced-cli" "revanced" "latest" get_patches_key "youtube-revanced-extended" get_ver "Hide general ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "revanced-extended" +patch "youtube" "revanced-extended" "inotia" ################################################# # Patch YouTube Music Extended: # Arm64-v8a get_patches_key "youtube-music-revanced-extended" -get_ver "Hide music ads" "com.google.android.apps.youtube.music" +version=6.23.55 +#get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -patch "youtube-music-arm64-v8a" "revanced-extended" +patch "youtube-music-arm64-v8a" "revanced-extended" "inotia" # Armeabi-v7a get_patches_key "youtube-music-revanced-extended" -get_ver "Hide music ads" "com.google.android.apps.youtube.music" +version=6.23.55 +#get_ver "Hide music ads" "com.google.android.apps.youtube.music" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -patch "youtube-music-armeabi-v7a" "revanced-extended" +patch "youtube-music-armeabi-v7a" "revanced-extended" "inotia" ################################################# # Patch Reddit: get_patches_key "reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit" -patch "reddit" "revanced-extended" +patch "reddit" "revanced-extended" "inotia" ################################################# diff --git a/src/build/utils.sh b/src/build/utils.sh index 9717d2d..2a55d13 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -129,24 +129,29 @@ get_apk() { patch() { if [ -f "$1.apk" ]; then local p b m ks a - if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then - num=${BASH_REMATCH[1]} - if [ $num -ge 4 ]; then - p="patch " b="--patch-bundle" m="--merge" a="" ks="ks" - echo "Patching with Revanced-cli version 4+" - elif [ $num -eq 3 ]; then - p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks" - echo "Patching with Revanced-cli version 3" - elif [ $num -eq 2 ]; then - p="" b="-b" m="-m" a="-a " ks="_ks" - echo "Patching with Revanced-cli version 2" + if [ "$3" = inotia ]; then + p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks" + echo "Patching with Revanced-cli inotia" + else + if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then + num=${BASH_REMATCH[1]} + if [ $num -ge 4 ]; then + p="patch " b="--patch-bundle" m="--merge" a="" ks="ks" + echo "Patching with Revanced-cli version 4+" + elif [ $num -eq 3 ]; then + p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks" + echo "Patching with Revanced-cli version 3" + elif [ $num -eq 2 ]; then + p="" b="-b" m="-m" a="-a " ks="_ks" + echo "Patching with Revanced-cli version 2" + else + echo "No revanced-cli supported" + exit 1 + fi else echo "No revanced-cli supported" exit 1 fi - else - echo "No revanced-cli supported" - exit 1 fi java -jar revanced-cli*.jar $p\ $b revanced-patches*.jar \ diff --git a/src/patches/youtube-music-revanced-extended/exclude-patches b/src/patches/youtube-music-revanced-extended/exclude-patches index 893b2c5..711513e 100644 --- a/src/patches/youtube-music-revanced-extended/exclude-patches +++ b/src/patches/youtube-music-revanced-extended/exclude-patches @@ -1,12 +1,12 @@ -custom-branding-music-afn-red -compact-header -disable-auto-captions -enable-force-minimized-player -enable-force-shuffle -hide-button-shelf -hide-carousel-shelf -hide-category-bar -hide-music-cast-button -hide-new-playlist -hide-playlist-card -optimize-resource-music +Custom branding icon Revancify Blue +Disable auto captions +Hide captions button +Hide button shelf +Hide carousel shelf +Hide category bar +Replace cast button +Hide cast button +Hide account menu +Hide mix playlists +Hide new playlist button +Hide playlist card \ No newline at end of file diff --git a/src/patches/youtube-revanced-extended/exclude-patches b/src/patches/youtube-revanced-extended/exclude-patches index 81d172f..7f462a5 100644 --- a/src/patches/youtube-revanced-extended/exclude-patches +++ b/src/patches/youtube-revanced-extended/exclude-patches @@ -1,25 +1,19 @@ -custom-branding-icon-afn-red -debugging -enable-compact-controls-overlay -hide-cast-button -disable-QUIC-protocol -disable-auto-captions -disable-hdr-video -enable-force-shuffle -enable-old-quality-layout -enable-zen-mode -hide-account-menu -hide-autoplay-button -hide-autoplay-preview -hide-button-container -hide-captions-button -hide-cast-button -hide-description-components -hide-handle -hide-latest-videos-button -hide-load-more-button -hide-mix-playlists -hide-previous-next-button -quick-actions-components -higher-fullscreen-seekbar-height -Custom-seekbar-color +Custom branding icon Revancify Blue +Enable compact controls overlay +Disable QUIC protocol +Disable auto captions +Disable HDR video +Enable old quality layout +Enable zen mode +Hide cast button +Hide account menu +Hide autoplay button +Hide autoplay preview +Hide captions button +Hide description components +Hide handle +Hide latest videos button +Hide load more button +Hide mix playlists +Hide previous next button +Custom seekbar color diff --git a/src/patches/youtube-revanced/exclude-patches b/src/patches/youtube-revanced/exclude-patches index c09adf1..668614f 100644 --- a/src/patches/youtube-revanced/exclude-patches +++ b/src/patches/youtube-revanced/exclude-patches @@ -1,14 +1,9 @@ -custom-branding -premium-heading -enable-debugging -disable-auto-captions -disable-player-popup-panels -hide-autoplay-button -hide-cast-button -hide-email-address -hide-player-buttons -hide-video-action-buttons -hide-captions-button -hide-timestamp -spoof-app-version -Return YouTube Dislike +Custom branding +Disable auto captions +Hide autoplay button +Hide cast button +Hide email address +Hide video action buttons +Hide captions button +Hide timestamp +Spoof app version \ No newline at end of file