From 444dd47aefcbc116fc84f0ce04a08932117cc196 Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Tue, 29 Aug 2023 23:48:04 +0700 Subject: [PATCH] Fix --- src/build/ReX.sh | 15 +++---- src/build/Revanced-Extended-Android-6-7.sh | 2 +- .../Revanced-Extended-inotia-discontinued.sh | 2 +- src/build/Revanced.sh | 6 +-- src/build/utils.sh | 12 ++--- src/patches/messenger/exclude-patches | 2 +- src/patches/youtube-ReX/exclude-patches | 44 +++++++++---------- src/patches/youtube-music-ReX/exclude-patches | 14 +++--- src/patches/youtube-revanced/exclude-patches | 26 +++++------ 9 files changed, 61 insertions(+), 62 deletions(-) diff --git a/src/build/ReX.sh b/src/build/ReX.sh index fb50b79..da438ea 100644 --- a/src/build/ReX.sh +++ b/src/build/ReX.sh @@ -10,9 +10,8 @@ checker "YT-Advanced/ReX-patches" "ReX" ################################################# # Download requirements -dl_gh "ReX-patches" "YT-Advanced" "latest" -dl_gh "ReX-integrations" "YT-Advanced" "tags/v0.117.2" -dl_gh "revanced-cli" "inotia00" "latest" +dl_gh "ReX-patches ReX-integrations" "YT-Advanced" "latest" +dl_gh "revanced-cli" "revanced" "latest" dl_htmlq ################################################# @@ -21,7 +20,7 @@ dl_htmlq get_patches_key "youtube-ReX" get_ver "Hide general ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" -_patch "youtube" "youtube-ReX" +patch "youtube" "youtube-ReX" ################################################# @@ -30,19 +29,19 @@ _patch "youtube" "youtube-ReX" # Arm64-v8a get_patches_key "youtube-music-ReX" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -_patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-ReX" +patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-ReX" # Armeabi-v7a get_patches_key "youtube-music-ReX" -version="6.08.51" +#version="6.08.51" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -_patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-ReX" +patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-ReX" ################################################# # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "tags/v2.187.0" +dl_gh "revanced-patches" "revanced" "latest" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-ReX" "youtube-${archs[i]}-ReX" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh index 3b5fb55..c74d94c 100644 --- a/src/build/Revanced-Extended-Android-6-7.sh +++ b/src/build/Revanced-Extended-Android-6-7.sh @@ -28,7 +28,7 @@ _patch "youtube" "youtube-revanced-extended-android-6-7" # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "tags/v2.187.0" +dl_gh "revanced-patches" "revanced" "latest" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced-extended-android-6-7" "youtube-${archs[i]}-revanced-extended-android-6-7" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/Revanced-Extended-inotia-discontinued.sh b/src/build/Revanced-Extended-inotia-discontinued.sh index 06bd2f5..e45b12c 100644 --- a/src/build/Revanced-Extended-inotia-discontinued.sh +++ b/src/build/Revanced-Extended-inotia-discontinued.sh @@ -46,7 +46,7 @@ _patch "reddit" "reddit-revanced-extended-inotia-discontinued" # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "tags/v2.187.0" +dl_gh "revanced-patches" "revanced" "latest" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced-extended-inotia-discontinued" "youtube-${archs[i]}-revanced-extended-inotia-discontinued" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 80629fb..0bd4a02 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -26,12 +26,12 @@ patch "youtube" "youtube-revanced" # Patch YouTube Music: # Arm64-v8a get_patches_key "youtube-music-revanced" -version="6.10.51" +#version="6.10.51" get_apk "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-revanced" # Armeabi-v7a get_patches_key "youtube-music-revanced" -version="6.08.51" +#version="6.08.51" get_apk "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-revanced" @@ -121,7 +121,7 @@ patch "windy" "windy-revanced" # Split architecture: rm -f revanced-cli* revanced-patches*.jar patches.json dl_gh "revanced-cli" "j-hc" "latest" -dl_gh "revanced-patches" "revanced" "tags/v2.187.0" +dl_gh "revanced-patches" "revanced" "latest" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/utils.sh b/src/build/utils.sh index ddc874f..9cc0698 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -141,7 +141,7 @@ get_apk() { ################################################# -# Patching apps with Revanced CLI (old): +# Patching apps with Revanced CLI (old version): _patch() { if [ -f "$1.apk" ]; then java -jar revanced-cli*.jar \ @@ -192,12 +192,12 @@ gen_rip_libs() { } split_arch() { if [ -f "./build/$1.apk" ]; then - java -jar revanced-cli*.jar \ - -b revanced-patches*.jar \ - -a ./build/$1.apk \ - --keystore=./src/ks.keystore \ + java -jar revanced-cli*.jar patch \ + --patch-bundle revanced-patches*.jar \ $3 \ - -o ./build/$2.apk + --keystore=./src/ks.keystore \ + --out=./build/$2.apk\ + ./build/$1.apk else exit 1 fi diff --git a/src/patches/messenger/exclude-patches b/src/patches/messenger/exclude-patches index 7fc25dc..f2a00c8 100644 --- a/src/patches/messenger/exclude-patches +++ b/src/patches/messenger/exclude-patches @@ -1 +1 @@ -Disable switching emoji to sticker in message input field +disable-switching-emoji-to-sticker-in-message-input-field diff --git a/src/patches/youtube-ReX/exclude-patches b/src/patches/youtube-ReX/exclude-patches index f58914e..f148986 100644 --- a/src/patches/youtube-ReX/exclude-patches +++ b/src/patches/youtube-ReX/exclude-patches @@ -1,22 +1,22 @@ -Custom branding icon Revancify blue -Enable compact controls overlay -Hide cast button -Disable QUIC protocol -Disable auto captions -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 -Hide quick actions -Custom seekbar color \ No newline at end of file +custom-branding-icon-revancify-blue +enable-compact-controls-overlay +hide-cast-button +disable-QUIC-protocol +disable-auto-captions +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 +hide-quick-actions +Custom-seekbar-color \ No newline at end of file diff --git a/src/patches/youtube-music-ReX/exclude-patches b/src/patches/youtube-music-ReX/exclude-patches index 840a95e..9c8ffed 100644 --- a/src/patches/youtube-music-ReX/exclude-patches +++ b/src/patches/youtube-music-ReX/exclude-patches @@ -1,7 +1,7 @@ -Custom branding icon Revancify blue -Disable auto captions -Hide button shelf -Hide carousel shelf -Hide cast button -Hide category bar -Hide new playlist button \ No newline at end of file +custom-branding-icon-revancify-blue +disable-auto-captions +hide-button-shelf +hide-carousel-shelf +hide-cast-button +hide-category-bar +hide-new-playlist-button \ No newline at end of file diff --git a/src/patches/youtube-revanced/exclude-patches b/src/patches/youtube-revanced/exclude-patches index bcb129d..95c8656 100644 --- a/src/patches/youtube-revanced/exclude-patches +++ b/src/patches/youtube-revanced/exclude-patches @@ -1,13 +1,13 @@ -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 +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