From 6fe244667a48e7384345cc83437bd8986675a9ba Mon Sep 17 00:00:00 2001 From: siritami <102145692+FiorenMas@users.noreply.github.com> Date: Sat, 2 Sep 2023 15:01:20 +0700 Subject: [PATCH] Added "options.json" --- docs/Frequently Asked Questions.md | 6 +++ src/build/ReX.sh | 6 +-- src/build/Revanced-Extended-Android-6-7.sh | 3 +- .../Revanced-Extended-inotia-discontinued.sh | 6 +-- src/build/Revanced.sh | 30 +++++++------- src/build/utils.sh | 41 ++++++++++--------- src/options/ReX.json | 1 + .../revanced-extended-android-6-7.json | 1 + ...revanced-extended-inotia-discontinued.json | 1 + src/options/revanced.json | 1 + src/patches/youtube-revanced/include-patches | 1 - 11 files changed, 53 insertions(+), 44 deletions(-) create mode 100644 src/options/ReX.json create mode 100644 src/options/revanced-extended-android-6-7.json create mode 100644 src/options/revanced-extended-inotia-discontinued.json create mode 100644 src/options/revanced.json diff --git a/docs/Frequently Asked Questions.md b/docs/Frequently Asked Questions.md index 6597566..e59417a 100644 --- a/docs/Frequently Asked Questions.md +++ b/docs/Frequently Asked Questions.md @@ -30,6 +30,12 @@ You should open the folder `Revanced-And-Revanced-Extended-Non-Root/src/patches/ --- +### Q: I want to use custom file options.json. How can I do it? + +You should open the folder `Revanced-And-Revanced-Extended-Non-Root/src/options/`. It contains files renvanced.json, ReX.json... edit thoose file same as options.json + +--- + ### Q: I am facing errors using your apps? I’m so sorry about this, but my repository only patches apps from “scripts” by other devs. I can’t fix errors when apps face errors, so if you get errors, please make an issue in [Revanced](https://github.com/revanced/revanced-patches), [Revanced Extended](https://github.com/inotia00/revanced-patches/tree/revanced-extended) or [Revanced Extended Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/tree/revanced-extended) repositories. diff --git a/src/build/ReX.sh b/src/build/ReX.sh index aeaa714..25a7a68 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" "ReX" ################################################# @@ -28,11 +28,11 @@ 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" "ReX" # Armeabi-v7a get_patches_key "youtube-music-ReX" 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" "ReX" ################################################# diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh index c74d94c..a4c687f 100644 --- a/src/build/Revanced-Extended-Android-6-7.sh +++ b/src/build/Revanced-Extended-Android-6-7.sh @@ -19,9 +19,8 @@ dl_htmlq # Patch YouTube Extended: 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" "revanced-extended-android-6-7" ################################################# diff --git a/src/build/Revanced-Extended-inotia-discontinued.sh b/src/build/Revanced-Extended-inotia-discontinued.sh index e45b12c..3c475f0 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" "revanced-extended-inotia-discontinued" ################################################# @@ -27,12 +27,12 @@ _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" "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" "revanced-extended-inotia-discontinued" ################################################# diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 0bd4a02..fe26364 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -19,7 +19,7 @@ dl_htmlq 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" +patch "youtube" "revanced" ################################################# @@ -28,12 +28,12 @@ patch "youtube" "youtube-revanced" get_patches_key "youtube-music-revanced" #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" +patch "youtube-music-arm64-v8a" "revanced" # Armeabi-v7a get_patches_key "youtube-music-revanced" #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" +patch "youtube-music-armeabi-v7a" "revanced" ################################################# @@ -42,7 +42,7 @@ patch "youtube-music-armeabi-v7a" "youtube-music-armeabi-v7a-revanced" get_patches_key "instagram" get_ver "Hide timeline ads" "com.instagram.android" get_apk "instagram-arm64-v8a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "arm64-v8a" -patch "instagram-arm64-v8a" "instagram-arm64-v8a-revanced" +patch "instagram-arm64-v8a" "revanced" ################################################# @@ -50,11 +50,11 @@ patch "instagram-arm64-v8a" "instagram-arm64-v8a-revanced" # Arm64-v8a get_patches_key "messenger" get_apk "messenger-arm64-v8a" "messenger" "facebook-2/messenger/messenger" "arm64-v8a" -patch "messenger-arm64-v8a" "messenger-arm64-v8a-revanced" +patch "messenger-arm64-v8a" "revanced" # Armeabi-v7a get_patches_key "messenger" get_apk "messenger-armeabi-v7a" "messenger" "facebook-2/messenger/messenger" "armeabi-v7a" -patch "messenger-armeabi-v7a" "messenger-armeabi-v7a-revanced" +patch "messenger-armeabi-v7a" "revanced" ################################################# @@ -62,7 +62,7 @@ patch "messenger-armeabi-v7a" "messenger-armeabi-v7a-revanced" get_patches_key "twitter" version="9.97.0-release.0" get_apk "twitter" "twitter" "twitter-inc/twitter/twitter" -patch "twitter" "twitter-revanced" +patch "twitter" "revanced" ################################################# @@ -70,14 +70,14 @@ patch "twitter" "twitter-revanced" get_patches_key "twitch" get_ver "Block video ads" "tv.twitch.android.app" get_apk "twitch" "twitch" "twitch-interactive-inc/twitch/twitch" -patch "twitch" "twitch-revanced" +patch "twitch" "revanced" ################################################# # Patch Reddit: get_patches_key "reddit" get_apk "reddit" "reddit" "redditinc/reddit/reddit" -patch "reddit" "reddit-revanced" +patch "reddit" "revanced" ################################################# @@ -85,7 +85,7 @@ patch "reddit" "reddit-revanced" get_patches_key "tiktok" version="30.5.2" get_apk "tiktok" "tik-tok-including-musical-ly" "tiktok-pte-ltd/tik-tok-including-musical-ly/tik-tok-including-musical-ly" -patch "tiktok" "tiktok-revanced" +patch "tiktok" "revanced" ################################################# @@ -93,28 +93,28 @@ patch "tiktok" "tiktok-revanced" get_patches_key "pixiv" #get_ver "Hide ads" "jp.pxv.android" get_apk "pixiv" "pixiv" "pixiv-inc/pixiv/pixiv" -patch "pixiv" "pixiv-revanced" +patch "pixiv" "revanced" ################################################# # Patch Lightroom: get_patches_key "lightroom" get_apk "lightroom" "lightroom" "adobe/lightroom/lightroom" -patch "lightroom" "lightroom-revanced" +patch "lightroom" "revanced" ################################################# # Patch Nova Launcher: #get_patches_key "nova-launcher" #get_apk "nova-launcher" "nova-launcher" "teslacoil-software/nova-launcher/nova-launcher" -#patch "nova-launcher" "nova-launcher-revanced" +#patch "nova-launcher" "revanced" ################################################# # Patch Windy: get_patches_key "windy" get_apk "windy" "windy-wind-weather-forecast" "windy-weather-world-inc/windy-wind-weather-forecast/windy-wind-weather-forecast" -patch "windy" "windy-revanced" +patch "windy" "revanced" ################################################# @@ -138,6 +138,6 @@ dl_gh "revanced-cli" "revanced" "tags/v2.21.2" get_patches_key "instagram" version="271.1.0.21.84" get_apk "instagram-armeabi-v7a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "armeabi-v7a" -_patch "instagram-armeabi-v7a" "instagram-armeabi-v7a-revanced" +_patch "instagram-armeabi-v7a" "revanced" ################################################# diff --git a/src/build/utils.sh b/src/build/utils.sh index 9cc0698..4ed7ae5 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -141,25 +141,6 @@ get_apk() { ################################################# -# Patching apps with Revanced CLI (old version): -_patch() { - if [ -f "$1.apk" ]; then - java -jar revanced-cli*.jar \ - -m revanced-integrations*.apk \ - -b revanced-patches*.jar \ - -a $1.apk \ - ${EXCLUDE_PATCHES[@]} \ - ${INCLUDE_PATCHES[@]} \ - --keystore=./src/ks.keystore \ - -o ./build/$2.apk - unset version - unset EXCLUDE_PATCHES - unset INCLUDE_PATCHES - else - exit 1 - fi -} - # Patching apps with Revanced CLI: patch() { if [ -f "$1.apk" ]; then @@ -168,8 +149,9 @@ patch() { --merge revanced-integrations*.apk \ ${EXCLUDE_PATCHES[@]} \ ${INCLUDE_PATCHES[@]} \ + --options=./src/options/$2.json \ --keystore=./src/ks.keystore \ - --out=./build/$2.apk \ + --out=./build/$1-$2.apk \ $1.apk unset version unset EXCLUDE_PATCHES @@ -179,6 +161,25 @@ patch() { fi } +# Patching apps with Revanced CLI (old version): +_patch() { + if [ -f "$1.apk" ]; then + java -jar revanced-cli*.jar \ + -m revanced-integrations*.apk \ + -b revanced-patches*.jar \ + -a $1.apk \ + ${EXCLUDE_PATCHES[@]} \ + ${INCLUDE_PATCHES[@]} \ + --options=./src/options/$2.json \ + --keystore=./src/ks.keystore \ + -o ./build/$1-$2.apk + unset version + unset EXCLUDE_PATCHES + unset INCLUDE_PATCHES + else + exit 1 + fi +} ################################################# diff --git a/src/options/ReX.json b/src/options/ReX.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/options/ReX.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/options/revanced-extended-android-6-7.json b/src/options/revanced-extended-android-6-7.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/options/revanced-extended-android-6-7.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/options/revanced-extended-inotia-discontinued.json b/src/options/revanced-extended-inotia-discontinued.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/options/revanced-extended-inotia-discontinued.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/options/revanced.json b/src/options/revanced.json new file mode 100644 index 0000000..0637a08 --- /dev/null +++ b/src/options/revanced.json @@ -0,0 +1 @@ +[] \ No newline at end of file diff --git a/src/patches/youtube-revanced/include-patches b/src/patches/youtube-revanced/include-patches index 69ee73d..e69de29 100644 --- a/src/patches/youtube-revanced/include-patches +++ b/src/patches/youtube-revanced/include-patches @@ -1 +0,0 @@ -client-spoof