diff --git a/src/build/ReX.sh b/src/build/ReX.sh index 2e215fe..4a456b9 100644 --- a/src/build/ReX.sh +++ b/src/build/ReX.sh @@ -19,7 +19,7 @@ dl_gh "revanced-cli" "revanced" "tags/v3.1.1" get_patches_key "youtube-ReX" get_ver "Hide general ads" "com.google.android.youtube" get_apk "youtube" "youtube" "google-inc/youtube/youtube" --patch "youtube" "ReX" +patch "youtube" "ReX" ################################################# @@ -28,19 +28,19 @@ get_apk "youtube" "youtube" "google-inc/youtube/youtube" get_patches_key "youtube-music-ReX" 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" "ReX" +patch "youtube-music-arm64-v8a" "ReX" # Armeabi-v7a get_patches_key "youtube-music-ReX" 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" "ReX" +patch "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.190.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-1.sh b/src/build/Revanced-1.sh index 93ec603..059f0dd 100644 --- a/src/build/Revanced-1.sh +++ b/src/build/Revanced-1.sh @@ -37,7 +37,7 @@ patch "youtube-music-armeabi-v7a" "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.190.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/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh index 2d4b24c..d0df010 100644 --- a/src/build/Revanced-Extended-Android-6-7.sh +++ b/src/build/Revanced-Extended-Android-6-7.sh @@ -19,14 +19,14 @@ dl_gh "revanced-cli" "revanced" "tags/v3.1.1" get_patches_key "youtube-revanced-extended-6-7" version="17.34.36" get_apk "youtube" "youtube" "google-inc/youtube/youtube" --patch "youtube" "revanced-extended-android-6-7" +patch "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.190.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.sh b/src/build/Revanced-Extended.sh index 3247ca5..8a26166 100644 --- a/src/build/Revanced-Extended.sh +++ b/src/build/Revanced-Extended.sh @@ -18,7 +18,7 @@ dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "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" ################################################# @@ -27,26 +27,26 @@ get_apk "youtube" "youtube" "google-inc/youtube/youtube" get_patches_key "youtube-music-revanced-extended" 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" # Armeabi-v7a get_patches_key "youtube-music-revanced-extended" 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" ################################################# # Patch Reddit: get_patches_key "reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit" --patch "reddit" "revanced-extended" +patch "reddit" "revanced-extended" ################################################# # 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.190.0" +dl_gh "revanced-patches" "revanced" "latest" # Split architecture Youtube: for i in {0..3}; do split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" diff --git a/src/build/utils.sh b/src/build/utils.sh index 8ff3c6c..190ed44 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -127,28 +127,6 @@ get_apk() { # 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[@]} \ - --options=./src/options/$2.json \ - --keystore=./src/ks.keystore \ - --out=./release/$1-$2.apk \ - --alias alias \ - --keystore-entry-password ReVanced \ - $1.apk - unset version - unset EXCLUDE_PATCHES - unset INCLUDE_PATCHES - else - exit 1 - fi -} - -# Patching apps with Revanced CLI (old version): --patch() { if [ -f "$1.apk" ]; then java -jar revanced-cli*.jar patch \ --patch-bundle revanced-patches*.jar \ @@ -201,7 +179,7 @@ split_arch() { java -jar revanced-cli*.jar patch \ --patch-bundle revanced-patches*.jar \ $3 \ - --keystore=./src/_ks.keystore \ + --keystore=./src/ks.keystore \ --out=./release/$2.apk\ ./release/$1.apk else diff --git a/src/ks.keystore b/src/ks.keystore index 1c07f38..14ac0d4 100644 Binary files a/src/ks.keystore and b/src/ks.keystore differ