diff --git a/src/build/ReX.sh b/src/build/ReX.sh index 66034cd..ca2c1c3 100644 --- a/src/build/ReX.sh +++ b/src/build/ReX.sh @@ -20,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" ################################################# @@ -28,19 +28,12 @@ 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" 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 Reddit: -get_patches_key "reddit" -get_apk "reddit" "reddit" "redditinc/reddit/reddit" -patch "reddit" "reddit-ReX" +_patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-ReX" ################################################# diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh index f70b088..9317ec1 100644 --- a/src/build/Revanced-Extended-Android-6-7.sh +++ b/src/build/Revanced-Extended-Android-6-7.sh @@ -11,7 +11,7 @@ checker "kitadai31/revanced-patches-android6-7" "revanced-extended-android-6-7" # Download requirements dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest" -dl_gh "revanced-cli" "revanced" "latest" +dl_gh "revanced-cli" "revanced" "tags/v2.21.5" dl_htmlq ################################################# @@ -21,7 +21,7 @@ get_patches_key "youtube-revanced-extended-6-7" version="17.34.36" #get_ver "hide-general-ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "youtube-revanced-extended-android-6-7" +_patch "youtube" "youtube-revanced-extended-android-6-7" ################################################# diff --git a/src/build/Revanced-Extended-inotia-discontinued.sh b/src/build/Revanced-Extended-inotia-discontinued.sh index 77e8bde..db0050e 100644 --- a/src/build/Revanced-Extended-inotia-discontinued.sh +++ b/src/build/Revanced-Extended-inotia-discontinued.sh @@ -19,7 +19,7 @@ dl_htmlq 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" "youtube-revanced-extended-inotia-discontinued" +_patch "youtube" "youtube-revanced-extended-inotia-discontinued" ################################################# @@ -27,19 +27,19 @@ patch "youtube" "youtube-revanced-extended-inotia-discontinued" # Arm64-v8a get_patches_key "youtube-music-revanced-extended" 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-extended-inotia-discontinued" +_patch "youtube-music-arm64-v8a" "youtube-music-arm64-v8a-revanced-extended-inotia-discontinued" # Armeabi-v7a get_patches_key "youtube-music-revanced-extended" 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-extended-inotia-discontinued" +_patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-revanced-extended-inotia-discontinued" ################################################# # Patch Reddit: get_patches_key "reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit" -patch "reddit" "reddit-revanced-extended-inotia-discontinued" +_patch "reddit" "reddit-revanced-extended-inotia-discontinued" ################################################# diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 1cc6b35..6bd4757 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -16,10 +16,10 @@ dl_htmlq ################################################# # Patch YouTube: -get_patches_key "youtube-revanced" -get_ver "Video ads" "com.google.android.youtube" -get_apk "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "youtube-revanced" +#get_patches_key "youtube-revanced" +#get_ver "Video ads" "com.google.android.youtube" +#get_apk "youtube" "youtube" "google-inc/youtube/youtube" +#patch "youtube" "youtube-revanced" ################################################# diff --git a/src/build/utils.sh b/src/build/utils.sh index bbe94b7..ddc874f 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -141,8 +141,8 @@ get_apk() { ################################################# -# Patching apps with Revanced CLI: -patch() { +# Patching apps with Revanced CLI (old): +_patch() { if [ -f "$1.apk" ]; then java -jar revanced-cli*.jar \ -m revanced-integrations*.apk \ @@ -160,6 +160,26 @@ patch() { fi } +# Patching apps with Revanced CLI: +patch() { + if [ -f "$1.apk" ]; then + java -jar revanced-cli*.jar patch \ + --patch-bundle revanced-patches*.jar \ + --merge revanced-integrations*.apk \ + ${EXCLUDE_PATCHES[@]} \ + ${INCLUDE_PATCHES[@]} \ + --keystore=./src/ks.keystore \ + --out=./build/$2.apk \ + $1.apk + unset version + unset EXCLUDE_PATCHES + unset INCLUDE_PATCHES + else + exit 1 + fi +} + + ################################################# # Split architectures using Revanced CLI, created by j-hc: