From 5c08015e387fc66929e1e6508359a6f41e65a2c2 Mon Sep 17 00:00:00 2001 From: Fioren <102145692+FiorenMas@users.noreply.github.com> Date: Sun, 27 Oct 2024 21:12:30 +0700 Subject: [PATCH] added youtube lite version - Split APKs no longer use the Revanced CLI to split; they are now directly patched from split APKs created with APKEditor. This means a smaller APK file size. - The added lite version is a version with unnecessary features removed. For example, it might only have an English interface and remove unused screen DPI from split APKs. - Improve workflow --- .github/workflows/manual-patch.yml | 113 ++++-------------- README.md | 76 ++++++------ src/build/Anddea-Revanced-Extended-Beta.sh | 68 +++++++++++ src/build/Anddea-Revanced-Extended.sh | 84 +++++++++---- src/build/ReX.sh | 42 ------- src/build/Revanced-Beta.sh | 69 ++++++++--- src/build/Revanced-Extended-Android-5.sh | 40 +++---- src/build/Revanced-Extended-Android-6-7.sh | 40 +++---- src/build/Revanced-Extended-Beta.sh | 92 +++++++++----- src/build/Revanced-Extended.sh | 90 +++++++++----- src/build/Revanced.sh | 66 +++++++--- src/build/Rufusin-Revanced-Extended.sh | 28 ----- src/build/utils.sh | 60 ++++++---- src/options/ReX.json | 1 - src/options/rufusin.json | 1 - src/patches/youtube-ReX/exclude-patches | 2 - src/patches/youtube-ReX/include-patches | 0 src/patches/youtube-music-ReX/exclude-patches | 1 - src/patches/youtube-music-ReX/include-patches | 0 .../youtube-rve-rufusin/exclude-patches | 2 - .../youtube-rve-rufusin/include-patches | 0 21 files changed, 481 insertions(+), 394 deletions(-) create mode 100644 src/build/Anddea-Revanced-Extended-Beta.sh delete mode 100644 src/build/ReX.sh delete mode 100644 src/build/Rufusin-Revanced-Extended.sh delete mode 100644 src/options/ReX.json delete mode 100644 src/options/rufusin.json delete mode 100644 src/patches/youtube-ReX/exclude-patches delete mode 100644 src/patches/youtube-ReX/include-patches delete mode 100644 src/patches/youtube-music-ReX/exclude-patches delete mode 100644 src/patches/youtube-music-ReX/include-patches delete mode 100644 src/patches/youtube-rve-rufusin/exclude-patches delete mode 100644 src/patches/youtube-rve-rufusin/include-patches diff --git a/.github/workflows/manual-patch.yml b/.github/workflows/manual-patch.yml index e4a77a9..a95bacb 100644 --- a/.github/workflows/manual-patch.yml +++ b/.github/workflows/manual-patch.yml @@ -29,8 +29,6 @@ on: - 'Revanced Extended Android 5' - 'BiliRoamingX' - 'Dropped Patches - indrastorms' - - 'ReX' - - 'RVE-rufusin' retry_count: description: 'Do not change value below' required: false @@ -47,21 +45,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - Include: - - org: "Revanced" - run: "1" - - org: "Revanced" - run: "2" - - org: "Revanced" - run: "3" - - org: "Revanced" - run: "4" - - org: "Revanced" - run: "5" - - org: "Revanced" - run: "6" - - org: "Revanced" - run: "7" + run: [1, 2, 3, 4, 5, 6, 7, 8, 9] steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -73,13 +57,13 @@ jobs: - name: Patch apk id: patch-rv if: steps.check-gh-rv.outputs.internet_error == '0' - run: bash src/build/Revanced.sh ${{ matrix.Include.run }} + run: bash src/build/Revanced.sh ${{ matrix.run }} - name: Releasing APK files id: release-rv if: steps.check-gh-rv.outputs.internet_error == '0' uses: ./.github/actions/release - name: Re-run workflow if github connection not stable - if: always() && steps.patch-rv.outcome == 'skipped' || steps.release-rv.outcome == 'skipped' && env.retry_count < env.max_retries && matrix.Include.run == '1' + if: always() && steps.patch-rv.outcome == 'skipped' || steps.release-rv.outcome == 'skipped' && env.retry_count < env.max_retries && matrix.run == '1' uses: ./.github/actions/re-run patch_rv_beta: name: Patch Revanced Beta @@ -87,21 +71,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - Include: - - org: "Revanced-Beta" - run: "1" - - org: "Revanced-Beta" - run: "2" - - org: "Revanced-Beta" - run: "3" - - org: "Revanced-Beta" - run: "4" - - org: "Revanced-Beta" - run: "5" - - org: "Revanced-Beta" - run: "6" - - org: "Revanced-Beta" - run: "7" + run: [1, 2, 3, 4, 5, 6, 7, 8, 9] steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -113,41 +83,21 @@ jobs: - name: Patch apk id: patch-rvb if: steps.check-gh-rvb.outputs.internet_error == '0' - run: bash src/build/Revanced-Beta.sh ${{ matrix.Include.run }} + run: bash src/build/Revanced-Beta.sh ${{ matrix.run }} - name: Releasing APK files id: release-rvb if: steps.check-gh-rvb.outputs.internet_error == '0' uses: ./.github/actions/release - name: Re-run workflow if github connection not stable - if: always() && steps.patch-rvb.outcome == 'skipped' || steps.release-rvb.outcome == 'skipped' && env.retry_count < env.max_retries && matrix.Include.run == '1' - uses: ./.github/actions/re-run - patch_rex: - name: Patch ReX - if: ${{ github.event.inputs.org == 'ReX' || inputs.org == 'ReX' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: Preparing to patch - uses: ./.github/actions/preparing - - name: Check github connection - id: check-gh-rex - run: bash src/etc/connection.sh - - name: Patch apk - id: patch-rex - if: steps.check-gh-rex.outputs.internet_error == '0' - run: bash src/build/ReX.sh - - name: Releasing APK files - id: release-rex - if: steps.check-gh-rex.outputs.internet_error == '0' - uses: ./.github/actions/release - - name: Re-run workflow if github connection not stable - if: always() && steps.patch-rex.outcome == 'skipped' || steps.release-rex.outcome == 'skipped' && env.retry_count < env.max_retries + if: always() && steps.patch-rvb.outcome == 'skipped' || steps.release-rvb.outcome == 'skipped' && env.retry_count < env.max_retries && matrix.run == '1' uses: ./.github/actions/re-run patch_rve_anddea_stable: name: Patch RVX Anddea Stable if: ${{ github.event.inputs.org == 'RVE-anddea-stable' || inputs.org == 'RVE-anddea-stable' }} runs-on: ubuntu-latest + strategy: + matrix: + run: [1, 2, 3] steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -159,7 +109,7 @@ jobs: - name: Patch apk id: patch-rve-anddea if: steps.check-gh-rve-anddea-stable.outputs.internet_error == '0' - run: bash src/build/Anddea-Revanced-Extended.sh latest + run: bash src/build/Anddea-Revanced-Extended.sh ${{ matrix.run }} - name: Releasing APK files id: release-rve-anddea-stable if: steps.check-gh-rve-anddea-stable.outputs.internet_error == '0' @@ -171,6 +121,9 @@ jobs: name: Patch RVX Anddea Beta version if: ${{ github.event.inputs.org == 'RVE-anddea-beta' || inputs.org == 'RVE-anddea-beta' }} runs-on: ubuntu-latest + strategy: + matrix: + run: [1, 2, 3] steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -182,41 +135,21 @@ jobs: - name: Patch apk id: patch-rve-anddea-beta if: steps.check-gh-rve-anddea-beta.outputs.internet_error == '0' - run: bash src/build/Anddea-Revanced-Extended.sh prerelease + run: bash src/build/Anddea-Revanced-Extended-Beta.sh ${{ matrix.run }} - name: Releasing APK files id: release-rve-anddea-beta if: steps.check-gh-rve-anddea-beta.outputs.internet_error == '0' uses: ./.github/actions/release - name: Re-run workflow if github connection not stable if: always() && steps.patch-rve-anddea-beta.outcome == 'skipped' || steps.release-rve-anddea-beta.outcome == 'skipped' && env.retry_count < env.max_retries - uses: ./.github/actions/re-run - patch_rve_rufusin_stable: - name: Patch RVX Rufusin Stable - if: ${{ github.event.inputs.org == 'RVE-rufusin' || inputs.org == 'RVE-rufusin' }} - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4.1.1 - - name: Preparing to patch - uses: ./.github/actions/preparing - - name: Check github connection - id: check-gh-rve-rufusin-stable - run: bash src/etc/connection.sh - - name: Patch apk - id: patch-rve-rufusin - if: steps.check-gh-rve-rufusin-stable.outputs.internet_error == '0' - run: bash src/build/Rufusin-Revanced-Extended.sh - - name: Releasing APK files - id: release-rve-rufusin-stable - if: steps.check-gh-rve-rufusin-stable.outputs.internet_error == '0' - uses: ./.github/actions/release - - name: Re-run workflow if github connection not stable - if: always() && steps.patch-rve-rufusin-stable.outcome == 'skipped' || steps.release-rve-rufusin-stable.outcome == 'skipped' && env.retry_count < env.max_retries - uses: ./.github/actions/re-run + uses: ./.github/actions/re-run patch_rve: name: Patch Revanced Extended Stable if: ${{ github.event.inputs.org == 'Revanced Extended' || inputs.org == 'Revanced Extended' }} runs-on: ubuntu-latest + strategy: + matrix: + run: [1, 2, 3] steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -228,7 +161,7 @@ jobs: - name: Patch apk id: patch-rve if: steps.check-gh-rve.outputs.internet_error == '0' - run: bash src/build/Revanced-Extended.sh + run: bash src/build/Revanced-Extended.sh ${{ matrix.run }} - name: Releasing APK files id: release-rve if: steps.check-gh-rve.outputs.internet_error == '0' @@ -240,6 +173,9 @@ jobs: name: Patch Revanced Extended Beta if: ${{ github.event.inputs.org == 'Revanced Extended Beta' || inputs.org == 'Revanced Extended Beta' }} runs-on: ubuntu-latest + strategy: + matrix: + run: [1, 2, 3] steps: - name: Checkout uses: actions/checkout@v4.1.1 @@ -251,7 +187,7 @@ jobs: - name: Patch apk id: patch-rve-beta if: steps.check-gh-rve-beta.outputs.internet_error == '0' - run: bash src/build/Revanced-Extended-Beta.sh + run: bash src/build/Revanced-Extended-Beta.sh ${{ matrix.run }} - name: Releasing APK files id: release-rve-beta if: steps.check-gh-rve-beta.outputs.internet_error == '0' @@ -419,5 +355,4 @@ jobs: uses: ./.github/actions/release - name: Re-run workflow if github connection not stable if: always() && steps.patch-Dropped-Patches-indrastorms.outcome == 'skipped' || steps.release-Dropped-Patches-indrastorms.outcome == 'skipped' && env.retry_count < env.max_retries - uses: ./.github/actions/re-run - + uses: ./.github/actions/re-run \ No newline at end of file diff --git a/README.md b/README.md index 57c36c7..934cb4f 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ They are open-source scripts for patching various apps like YouTube, YouTube Mus Simply, all you need to do is choose the app you want to use from the options below: 'Revanced' or 'Revanced Extended'. Then, select your phone's CPU architecture. If you don't know what your phone's CPU architecture is, choose All Architectures. That's all there is to it. > [!NOTE] -> If you want to use the YouTube or YouTube Music app, you need to download and install [MicroG](https://github.com/ReVanced/GmsCore/releases). +> If you want to use the YouTube, YouTube Music or Google Photos app, you need to download and install [MicroG](https://github.com/ReVanced/GmsCore/releases). > > If you are an advanced user and you want to use custom patches for patching apps, you should read the [Wiki](../main/docs/Frequently%20Asked%20Questions.md#q-how-do-i-use-this-repository-for-patching-my-own-app). > @@ -42,6 +42,10 @@ Download [![YouTube](https://img.shields.io/badge/YouTube-%23FF0000.svg?style=for-the-badge&logo=YouTube&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.youtube) +> [!IMPORTANT] +> A lite version is a version with unnecessary things removed. For example, it might only have an English interface and remove unused screen DPI from split APKs +> + ### [Revanced:](https://github.com/revanced/revanced-patches) | [Stable version](https://github.com/ReVanced/revanced-patches/releases/latest) | [Beta version](https://github.com/ReVanced/revanced-patches/releases) | @@ -52,6 +56,16 @@ Download | [x86](../../releases/download/all/youtube-x86-revanced.apk) | [x86](../../releases/download/all/youtube-beta-x86-revanced.apk) | | [x86_64](../../releases/download/all/youtube-x86_64-revanced.apk) | [x86_64](../../releases/download/all/youtube-beta-x86_64-revanced.apk) | +
+ Lite version + +| [Stable version](https://github.com/ReVanced/revanced-patches/releases/latest) | [Beta version](https://github.com/ReVanced/revanced-patches/releases) | +| ---------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | +| [Arm64-v8a](../../releases/download/all/youtube-lite-arm64-v8a-revanced.apk) | [Arm64-v8a](../../releases/download/all/youtube-lite-beta-arm64-v8a-revanced.apk) | +| [Armeabi-v7a](../../releases/download/all/youtube-lite-armeabi-v7a-revanced.apk) | [Armeabi-v7a](../../releases/download/all/youtube-lite-beta-armeabi-v7a-revanced.apk) | + +
+ ### [Revanced Extended:](https://github.com/inotia00/revanced-patches/) | [Stable version](https://github.com/inotia00/revanced-patches/releases/latest) | [Beta version](https://github.com/inotia00/revanced-patches/releases) | @@ -62,6 +76,16 @@ Download | [x86](../../releases/download/all/youtube-x86-revanced-extended.apk) | [x86](../../releases/download/all/youtube-beta-x86-revanced-extended.apk) | | [x86_64](../../releases/download/all/youtube-x86_64-revanced-extended.apk) | [x86_64](../../releases/download/all/youtube-beta-x86_64-revanced-extended.apk) | +
+ Lite version + +| [Stable version](https://github.com/inotia00/revanced-patches/releases/latest) | [Beta version](https://github.com/inotia00/revanced-patches/releases) | +| ------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------- | +| [Arm64-v8a](../../releases/download/all/youtube-lite-arm64-v8a-revanced-extended.apk) | [Arm64-v8a](../../releases/download/all/youtube-lite-beta-arm64-v8a-revanced-extended.apk) | +| [Armeabi-v7a](../../releases/download/all/youtube-lite-armeabi-v7a-revanced-extended.apk) | [Armeabi-v7a](../../releases/download/all/youtube-lite-beta-armeabi-v7a-revanced-extended.apk) | + +
+ ### [Revanced Extended forked by anddea:](https://github.com/anddea/revanced-patches) | [Stable version](https://github.com/anddea/revanced-patches/releases/latest) | [Beta version](https://github.com/anddea/revanced-patches/releases) | @@ -72,6 +96,16 @@ Download | [x86](../../releases/download/all/youtube-stable-x86-anddea.apk) | [x86](../../releases/download/all/youtube-beta-x86-anddea.apk) | | [x86_64](../../releases/download/all/youtube-stable-x86_64-anddea.apk) | [x86_64](../../releases/download/all/youtube-beta-x86_64-anddea.apk) | +
+ Lite version + +| [Stable version](https://github.com/anddea/revanced-patches/releases/latest) | [Beta version](https://github.com/anddea/revanced-patches/releases) | +| ---------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------- | +| [Arm64-v8a](../../releases/download/all/youtube-lite-arm64-v8a-anddea.apk) | [Arm64-v8a](../../releases/download/all/youtube-lite-beta-arm64-v8a-anddea.apk) | +| [Armeabi-v7a](../../releases/download/all/youtube-lite-armeabi-v7a-anddea.apk) | [Armeabi-v7a](../../releases/download/all/youtube-lite-beta-armeabi-v7a-anddea.apk) | + +
+ ### [Revanced Extended For Android 6 & 7:](https://github.com/kitadai31/revanced-patches-android6-7/tree/revanced-extended) [All Architectures](../../releases/download/all/youtube-revanced-extended-android-6-7.apk) @@ -97,35 +131,6 @@ Download [x86_64](../../releases/download/all/youtube-x86_64-revanced-extended-android-5.apk) -
- Discontinued project - -### [Revanced Extended forked by rufusin:](https://github.com/rufusin/revanced-patches) - -[All Architectures](../../releases/download/all/youtube-rufusin.apk) - -[Arm64-v8a](../../releases/download/all/youtube-arm64-v8a-rufusin.apk) - -[Armeabi-v7a](../../releases/download/all/youtube-armeabi-v7a-rufusin.apk) - -[x86](../../releases/download/all/youtube-x86-rufusin.apk) - -[x86_64](../../releases/download/all/youtube-x86_64-rufusin.apk) - -### [ReX: (forked from Revanced Extended)](https://github.com/YT-Advanced/ReX-patches) - -[All Architectures](../../releases/download/all/youtube-ReX.apk) - -[Arm64-v8a](../../releases/download/all/youtube-arm64-v8a-ReX.apk) - -[Armeabi-v7a](../../releases/download/all/youtube-armeabi-v7a-ReX.apk) - -[x86](../../releases/download/all/youtube-x86-ReX.apk) - -[x86_64](../../releases/download/all/youtube-x86_64-ReX.apk) - -
- --- [![YouTube Music](https://img.shields.io/badge/YouTube_Music-FF0000?style=for-the-badge&logo=youtube-music&logoColor=white)](https://play.google.com/store/apps/details?id=com.google.android.apps.youtube.music) @@ -151,17 +156,6 @@ Download | [Arm64-v8a](../../releases/download/all/youtube-music-stable-arm64-v8a-anddea.apk) | [Arm64-v8a](../../releases/download/all/youtube-music-beta-arm64-v8a-anddea.apk) | | [Armeabi-v7a](../../releases/download/all/youtube-music-stable-armeabi-v7a-anddea.apk) | [Armeabi-v7a](../../releases/download/all/youtube-music-beta-armeabi-v7a-anddea.apk) | -
- Discontinued project - -### ReX: - -[Arm64-v8a](../../releases/download/all/youtube-music-arm64-v8a-ReX.apk) - -[Armeabi-v7a](../../releases/download/all/youtube-music-armeabi-v7a-ReX.apk) - -
- --- [![Facebook](https://img.shields.io/badge/Facebook-%231877F2.svg?style=for-the-badge&logo=Facebook&logoColor=white)](https://play.google.com/store/apps/details?id=com.facebook.katana&hl) diff --git a/src/build/Anddea-Revanced-Extended-Beta.sh b/src/build/Anddea-Revanced-Extended-Beta.sh new file mode 100644 index 0000000..65f5472 --- /dev/null +++ b/src/build/Anddea-Revanced-Extended-Beta.sh @@ -0,0 +1,68 @@ +#!/bin/bash +# Revanced Extended forked by Anddea build +source src/build/utils.sh +# Download requirements +revanced_dl(){ + dl_gh "revanced-patches revanced-integrations" "anddea" "latest" + dl_gh "revanced-cli" "inotia00" "latest" +} + +1() { + revanced_dl + # Patch YouTube: + get_patches_key "youtube-rve-anddea" + get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube-beta" "youtube-beta" + patch "youtube-beta" "anddea" "inotia" + # Patch Youtube Arm64-v8a + get_patches_key "youtube-rve-anddea" + split_editor "youtube-beta" "youtube-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + patch "youtube-beta-arm64-v8a" "anddea" "inotia" + # Patch Youtube Armeabi-v7a + get_patches_key "youtube-rve-anddea" + split_editor "youtube-beta" "youtube-beta-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + patch "youtube-beta-armeabi-v7a" "anddea" "inotia" + # Patch Youtube x86 + get_patches_key "youtube-rve-anddea" + split_editor "youtube-beta" "youtube-beta-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + patch "youtube-beta-x86" "anddea" "inotia" + # Patch Youtube x86_64 + get_patches_key "youtube-rve-anddea" + split_editor "youtube-beta" "youtube-beta-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + patch "youtube-beta-x86_64" "anddea" "inotia" +} +2() { + revanced_dl + # Patch YouTube Music Extended: + # Arm64-v8a + get_patches_key "youtube-music-rve-anddea" + get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" + patch "youtube-music-beta-arm64-v8a" "anddea" "inotia" + # Armeabi-v7a + get_patches_key "youtube-music-rve-anddea" + get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" + patch "youtube-music-beta-armeabi-v7a" "anddea" "inotia" +} +3() { + revanced_dl + get_apk "com.google.android.youtube" "youtube-lite-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + # Patch YouTube Lite Arm64-v8a: + get_patches_key "youtube-rve-anddea" + split_editor "youtube-lite-beta" "youtube-lite-beta-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-beta-arm64-v8a" "anddea" "inotia" + # Patch YouTube Lite Armeabi-v7a: + get_patches_key "youtube-rve-anddea" + split_editor "youtube-lite-beta" "youtube-lite-beta-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-beta-armeabi-v7a" "anddea" "inotia" +} +case "$1" in + 1) + 1 + ;; + 2) + 2 + ;; + 3) + 3 + ;; +esac diff --git a/src/build/Anddea-Revanced-Extended.sh b/src/build/Anddea-Revanced-Extended.sh index 064c0a1..3e95e5f 100644 --- a/src/build/Anddea-Revanced-Extended.sh +++ b/src/build/Anddea-Revanced-Extended.sh @@ -1,36 +1,68 @@ #!/bin/bash # Revanced Extended forked by Anddea build source src/build/utils.sh +# Download requirements +revanced_dl(){ + dl_gh "revanced-patches revanced-integrations" "anddea" "latest" + dl_gh "revanced-cli" "inotia00" "latest" +} -patch_rve_anddea () { - # Patch YouTube Revanced Extended Anddea: - dl_gh "revanced-cli" "revanced" "latest" - local v apk_name - if [[ "$1" == "latest" ]]; then - v="latest" apk_name="stable" - else - v="prerelease" apk_name="beta" - fi - dl_gh "revanced-patches revanced-integrations" "anddea" "$v" +1() { + revanced_dl + # Patch YouTube: get_patches_key "youtube-rve-anddea" - get_apk "com.google.android.youtube" "youtube-$apk_name" "youtube" "google-inc/youtube/youtube" - patch "youtube-$apk_name" "anddea" - # Patch Youtube Music: + get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube" "youtube" + patch "youtube" "anddea" "inotia" + # Patch Youtube Arm64-v8a + get_patches_key "youtube-rve-anddea" + split_editor "youtube" "youtube-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + patch "youtube-arm64-v8a" "anddea" "inotia" + # Patch Youtube Armeabi-v7a + get_patches_key "youtube-rve-anddea" + split_editor "youtube" "youtube-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + patch "youtube-armeabi-v7a" "anddea" "inotia" + # Patch Youtube x86 + get_patches_key "youtube-rve-anddea" + split_editor "youtube" "youtube-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + patch "youtube-x86" "anddea" "inotia" + # Patch Youtube x86_64 + get_patches_key "youtube-rve-anddea" + split_editor "youtube" "youtube-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + patch "youtube-x86_64" "anddea" "inotia" +} +2() { + revanced_dl + # Patch YouTube Music Extended: # Arm64-v8a get_patches_key "youtube-music-rve-anddea" - get_apk "com.google.android.apps.youtube.music" "youtube-music-$apk_name-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" - patch "youtube-music-$apk_name-arm64-v8a" "anddea" + get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" + patch "youtube-music-arm64-v8a" "anddea" "inotia" # Armeabi-v7a get_patches_key "youtube-music-rve-anddea" - get_apk "com.google.android.apps.youtube.music" "youtube-music-$apk_name-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" - patch "youtube-music-$apk_name-armeabi-v7a" "anddea" - # Split architecture: - rm -f revanced-cli* revanced-patches*.jar *.json - dl_gh "revanced-cli" "inotia00" "latest" - dl_gh "revanced-patches" "inotia00" "latest" - # Split architecture Youtube: - for i in {0..3}; do - split_arch "youtube-$apk_name-anddea" "youtube-$apk_name-${archs[i]}-anddea" "$(gen_rip_libs ${libs[i]})" - done + get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" + patch "youtube-music-armeabi-v7a" "anddea" "inotia" } -patch_rve_anddea $1 +3() { + revanced_dl + get_apk "com.google.android.youtube" "youtube-lite" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + # Patch YouTube Lite Arm64-v8a: + get_patches_key "youtube-rve-anddea" + split_editor "youtube-lite" "youtube-lite-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-arm64-v8a" "anddea" "inotia" + # Patch YouTube Lite Armeabi-v7a: + get_patches_key "youtube-rve-anddea" + split_editor "youtube-lite" "youtube-lite-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-armeabi-v7a" "anddea" "inotia" +} +case "$1" in + 1) + 1 + ;; + 2) + 2 + ;; + 3) + 3 + ;; +esac diff --git a/src/build/ReX.sh b/src/build/ReX.sh deleted file mode 100644 index db36ec6..0000000 --- a/src/build/ReX.sh +++ /dev/null @@ -1,42 +0,0 @@ -#!/bin/bash -# ReX build -source src/build/utils.sh - -################################################# - -# Download requirements -dl_gh "ReX-patches ReX-integrations" "YT-Advanced" "latest" -dl_gh "revanced-cli" "revanced" "latest" - -################################################# - -# Patch YouTube ReX: -get_patches_key "youtube-ReX" -get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "ReX" - -################################################# - -# Patch YouTube Music ReX: -# Arm64-v8a -get_patches_key "youtube-music-ReX" -get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -patch "youtube-music-arm64-v8a" "ReX" -# Armeabi-v7a -get_patches_key "youtube-music-ReX" -get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -patch "youtube-music-armeabi-v7a" "ReX" - -################################################# - -# Split architecture: -rm -f revanced-cli* revanced-patches*.jar *.json -dl_gh "revanced-cli" "inotia00" "latest" -dl_gh "revanced-patches" "inotia00" "latest" -# Split architecture Youtube: -get_patches_key "youtube-ReX" -for i in {0..3}; do - split_arch "youtube-ReX" "youtube-${archs[i]}-ReX" "$(gen_rip_libs ${libs[i]})" -done - -################################################# \ No newline at end of file diff --git a/src/build/Revanced-Beta.sh b/src/build/Revanced-Beta.sh index b797e7b..0cc6997 100644 --- a/src/build/Revanced-Beta.sh +++ b/src/build/Revanced-Beta.sh @@ -10,25 +10,25 @@ revanced_dl(){ revanced_dl # Patch YouTube: get_patches_key "youtube-revanced" - get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" + get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube-beta" "youtube-beta" patch "youtube-beta" "revanced" - # Patch YouTube Music: - # Arm64-v8a - get_patches_key "youtube-music-revanced" - get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" - patch "youtube-music-beta-arm64-v8a" "revanced" - # Armeabi-v7a - get_patches_key "youtube-music-revanced" - get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" - patch "youtube-music-beta-armeabi-v7a" "revanced" - # Split architecture: - rm -f revanced-cli* revanced-patches*.jar *.json - dl_gh "revanced-cli" "inotia00" "latest" - dl_gh "revanced-patches" "inotia00" "latest" - # Split architecture Youtube: - for i in {0..3}; do - split_arch "youtube-beta-revanced" "youtube-beta-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})" - done + # Patch Youtube Arm64-v8a + get_patches_key "youtube-revanced" + split_editor "youtube-beta" "youtube-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + patch "youtube-beta-arm64-v8a" "revanced" + # Patch Youtube Armeabi-v7a + get_patches_key "youtube-revanced" + split_editor "youtube-beta" "youtube-beta-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + patch "youtube-beta-armeabi-v7a" "revanced" + # Patch Youtube x86 + get_patches_key "youtube-revanced" + split_editor "youtube-beta" "youtube-beta-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + patch "youtube-beta-x86" "revanced" + # Patch Youtube x86_64 + get_patches_key "youtube-revanced" + split_editor "youtube-beta" "youtube-beta-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + patch "youtube-beta-x86_64" "revanced" } 2() { revanced_dl @@ -41,7 +41,7 @@ revanced_dl(){ # Patch Facebook: # Arm64-v8a get_patches_key "facebook" - version="485.0.0.70.77" + version="485.0.0.70.77" get_apk "com.facebook.katana" "facebook-arm64-v8a-beta" "facebook" "facebook-2/facebook/facebook" "arm64-v8a" "nodpi" "Android 11+" patch "facebook-arm64-v8a-beta" "revanced" } @@ -102,6 +102,31 @@ revanced_dl(){ get_apk "com.rarlab.rar" "rar-beta" "rar" "rarlab-published-by-win-rar-gmbh/rar/rar" "arm64-v8a" patch "rar-beta" "revanced" } +8() { + revanced_dl + # Patch YouTube Lite Arm64-v8a: + get_patches_key "youtube-revanced" + get_apk "com.google.android.youtube" "youtube-lite-beta-arm64-v8a" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube-lite-beta-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xxxhdpi" + patch "youtube-lite-beta-arm64-v8a" "revanced" + # Patch YouTube Lite Armeabi-v7a: + get_patches_key "youtube-revanced" + get_apk "com.google.android.youtube" "youtube-lite-beta-armeabi-v7a" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube-lite-beta-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xxxhdpi" + patch "youtube-lite-beta-armeabi-v7a" "revanced" +} +9() { + revanced_dl + # Patch YouTube Music: + # Arm64-v8a + get_patches_key "youtube-music-revanced" + get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" + patch "youtube-music-beta-arm64-v8a" "revanced" + # Armeabi-v7a + get_patches_key "youtube-music-revanced" + get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" + patch "youtube-music-beta-armeabi-v7a" "revanced" +} case "$1" in 1) 1 @@ -124,4 +149,10 @@ case "$1" in 7) 7 ;; + 8) + 8 + ;; + 9) + 9 + ;; esac diff --git a/src/build/Revanced-Extended-Android-5.sh b/src/build/Revanced-Extended-Android-5.sh index c371c7a..d313d04 100644 --- a/src/build/Revanced-Extended-Android-5.sh +++ b/src/build/Revanced-Extended-Android-5.sh @@ -2,29 +2,29 @@ # Revanced Extended for android 5 source src/build/utils.sh -################################################# - # Download requirements dl_gh "revanced-patches-android5 revanced-integrations" "d4n3436" "latest" dl_gh "revanced-cli" "revanced" "v3.1.1" -################################################# - -# Patch YouTube Extended: +# Patch YouTube Extended for android 5: get_patches_key "youtube-revanced-extended-5" version="16.40.36" -get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "revanced-extended-android-5" - -################################################# - -# Split architecture: -rm -f revanced-cli* revanced-patches*.jar *.json -dl_gh "revanced-cli" "inotia00" "latest" -dl_gh "revanced-patches" "inotia00" "latest" -# Split architecture Youtube: -for i in {0..3}; do - split_arch "youtube-revanced-extended-android-5" "youtube-${archs[i]}-revanced-extended-android-5" "$(_gen_rip_libs ${_libs[i]})" -done - -################################################# \ No newline at end of file +get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" "Bundle_extract" +split_editor "youtube" "youtube" +patch "youtube" "revanced-extended-5" +# Patch Youtube Arm64-v8a +get_patches_key "youtube-revanced-extended-5" +split_editor "youtube" "youtube-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" +patch "youtube-arm64-v8a" "revanced-extended-5" +# Patch Youtube Armeabi-v7a +get_patches_key "youtube-revanced-extended-5" +split_editor "youtube" "youtube-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" +patch "youtube-armeabi-v7a" "revanced-extended-5" +# Patch Youtube x86 +get_patches_key "youtube-revanced-extended-5" +split_editor "youtube" "youtube-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" +patch "youtube-x86" "revanced-extended-5" +# Patch Youtube x86_64 +get_patches_key "youtube-revanced-extended-5" +split_editor "youtube" "youtube-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" +patch "youtube-x86_64" "revanced-extended-5" \ No newline at end of file diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh index b4cef69..276870c 100644 --- a/src/build/Revanced-Extended-Android-6-7.sh +++ b/src/build/Revanced-Extended-Android-6-7.sh @@ -2,29 +2,29 @@ # Revanced Extended for android 6 & 7 build source src/build/utils.sh -################################################# - # Download requirements dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest" dl_gh "revanced-cli" "revanced" "v3.1.1" - -################################################# - -# Patch YouTube Extended: +revanced_dl +# Patch YouTube Extended for android 6 & 7: get_patches_key "youtube-revanced-extended-6-7" version="17.34.36" -get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" +get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" "Bundle_extract" +split_editor "youtube" "youtube" patch "youtube" "revanced-extended-android-6-7" - -################################################# - -# Split architecture: -rm -f revanced-cli* revanced-patches*.jar *.json -dl_gh "revanced-cli" "inotia00" "latest" -dl_gh "revanced-patches" "inotia00" "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]})" -done - -################################################# \ No newline at end of file +# Patch Youtube Arm64-v8a +get_patches_key "youtube-revanced-extended-6-7" +split_editor "youtube" "youtube-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" +patch "youtube-arm64-v8a" "revanced-extended-android-6-7" +# Patch Youtube Armeabi-v7a +get_patches_key "youtube-revanced-extended-6-7" +split_editor "youtube" "youtube-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" +patch "youtube-armeabi-v7a" "revanced-extended-android-6-7" +# Patch Youtube x86 +get_patches_key "youtube-revanced-extended-6-7" +split_editor "youtube" "youtube-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" +patch "youtube-x86" "revanced-extended-android-6-7" +# Patch Youtube x86_64 +get_patches_key "youtube-revanced-extended-6-7" +split_editor "youtube" "youtube-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" +patch "youtube-x86_64" "revanced-extended-android-6-7" \ No newline at end of file diff --git a/src/build/Revanced-Extended-Beta.sh b/src/build/Revanced-Extended-Beta.sh index f0e5986..aaa9f9e 100644 --- a/src/build/Revanced-Extended-Beta.sh +++ b/src/build/Revanced-Extended-Beta.sh @@ -2,34 +2,68 @@ # Revanced Extended build source src/build/utils.sh -################################################# - # Download requirements -dl_gh "revanced-patches revanced-integrations" "inotia00" "prerelease" -dl_gh "revanced-cli" "inotia00" "latest" +revanced_dl(){ + dl_gh "revanced-patches revanced-integrations" "inotia00" "prerelease" + dl_gh "revanced-cli" "inotia00" "latest" +} -################################################# - -# Patch YouTube Extended: -get_patches_key "youtube-revanced-extended" -get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" -patch "youtube-beta" "revanced-extended" "inotia" - -################################################# - -# Patch YouTube Music Extended: -# Arm64-v8a -get_patches_key "youtube-music-revanced-extended" -get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -patch "youtube-music-beta-arm64-v8a" "revanced-extended" "inotia" -# Armeabi-v7a -get_patches_key "youtube-music-revanced-extended" -get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -patch "youtube-music-beta-armeabi-v7a" "revanced-extended" "inotia" - -################################################# - -# Split architecture Youtube: -for i in {0..3}; do - split_arch "youtube-beta-revanced-extended" "youtube-beta-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" -done \ No newline at end of file +1() { + revanced_dl + # Patch YouTube: + get_patches_key "youtube-revanced-extended" + get_apk "com.google.android.youtube" "youtube-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube-beta" "youtube-beta" + patch "youtube-beta" "revanced-extended" "inotia" + # Patch Youtube Arm64-v8a + get_patches_key "youtube-revanced-extended" + split_editor "youtube-beta" "youtube-beta-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + patch "youtube-beta-arm64-v8a" "revanced-extended" "inotia" + # Patch Youtube Armeabi-v7a + get_patches_key "youtube-revanced-extended" + split_editor "youtube-beta" "youtube-beta-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + patch "youtube-beta-armeabi-v7a" "revanced-extended" "inotia" + # Patch Youtube x86 + get_patches_key "youtube-revanced-extended" + split_editor "youtube-beta" "youtube-beta-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + patch "youtube-beta-x86" "revanced-extended" "inotia" + # Patch Youtube x86_64 + get_patches_key "youtube-revanced-extended" + split_editor "youtube-beta" "youtube-beta-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + patch "youtube-beta-x86_64" "revanced-extended" "inotia" +} +2() { + revanced_dl + # Patch YouTube Music Extended: + # Arm64-v8a + get_patches_key "youtube-music-revanced-extended" + get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" + patch "youtube-music-beta-arm64-v8a" "revanced-extended" "inotia" + # Armeabi-v7a + get_patches_key "youtube-music-revanced-extended" + get_apk "com.google.android.apps.youtube.music" "youtube-music-beta-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" + patch "youtube-music-beta-armeabi-v7a" "revanced-extended" "inotia" +} +3() { + revanced_dl + get_apk "com.google.android.youtube" "youtube-lite-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + # Patch YouTube Lite Arm64-v8a: + get_patches_key "youtube-revanced-extended" + split_editor "youtube-lite-beta" "youtube-lite-beta-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-beta-arm64-v8a" "revanced-extended" "inotia" + # Patch YouTube Lite Armeabi-v7a: + get_patches_key "youtube-revanced-extended" + split_editor "youtube-lite-beta" "youtube-lite-beta-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-beta-armeabi-v7a" "revanced-extended" "inotia" +} +case "$1" in + 1) + 1 + ;; + 2) + 2 + ;; + 3) + 3 + ;; +esac \ No newline at end of file diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh index ae6b792..831971d 100644 --- a/src/build/Revanced-Extended.sh +++ b/src/build/Revanced-Extended.sh @@ -2,33 +2,67 @@ # Revanced Extended build source src/build/utils.sh -################################################# - # Download requirements -dl_gh "revanced-patches revanced-integrations revanced-cli" "inotia00" "latest" +revanced_dl(){ + dl_gh "revanced-patches revanced-integrations revanced-cli" "inotia00" "latest" +} -################################################# - -# Patch YouTube Extended: -get_patches_key "youtube-revanced-extended" -get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "revanced-extended" "inotia" - -################################################# - -# Patch YouTube Music Extended: -# Arm64-v8a -get_patches_key "youtube-music-revanced-extended" -get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" -patch "youtube-music-arm64-v8a" "revanced-extended" "inotia" -# Armeabi-v7a -get_patches_key "youtube-music-revanced-extended" -get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" -patch "youtube-music-armeabi-v7a" "revanced-extended" "inotia" - -################################################# - -# Split architecture Youtube: -for i in {0..3}; do - split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})" -done \ No newline at end of file +1() { + revanced_dl + # Patch YouTube: + get_patches_key "youtube-revanced-extended" + get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube" "youtube" + patch "youtube" "revanced-extended" "inotia" + # Patch Youtube Arm64-v8a + get_patches_key "youtube-revanced-extended" + split_editor "youtube" "youtube-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + patch "youtube-arm64-v8a" "revanced-extended" "inotia" + # Patch Youtube Armeabi-v7a + get_patches_key "youtube-revanced-extended" + split_editor "youtube" "youtube-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + patch "youtube-armeabi-v7a" "revanced-extended" "inotia" + # Patch Youtube x86 + get_patches_key "youtube-revanced-extended" + split_editor "youtube" "youtube-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + patch "youtube-x86" "revanced-extended" "inotia" + # Patch Youtube x86_64 + get_patches_key "youtube-revanced-extended" + split_editor "youtube" "youtube-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + patch "youtube-x86_64" "revanced-extended" "inotia" +} +2() { + revanced_dl + # Patch YouTube Music Extended: + # Arm64-v8a + get_patches_key "youtube-music-revanced-extended" + get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" + patch "youtube-music-arm64-v8a" "revanced-extended" "inotia" + # Armeabi-v7a + get_patches_key "youtube-music-revanced-extended" + get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" + patch "youtube-music-armeabi-v7a" "revanced-extended" "inotia" +} +3() { + revanced_dl + get_apk "com.google.android.youtube" "youtube-lite" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + # Patch YouTube Lite Arm64-v8a: + get_patches_key "youtube-revanced-extended" + split_editor "youtube-lite" "youtube-lite-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-arm64-v8a" "revanced-extended" "inotia" + # Patch YouTube Lite Armeabi-v7a: + get_patches_key "youtube-revanced-extended" + split_editor "youtube-lite" "youtube-lite-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xhdpi split_config.xxxhdpi" + patch "youtube-lite-armeabi-v7a" "revanced-extended" "inotia" +} +case "$1" in + 1) + 1 + ;; + 2) + 2 + ;; + 3) + 3 + ;; +esac \ No newline at end of file diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh index 91cc393..5a3b47b 100644 --- a/src/build/Revanced.sh +++ b/src/build/Revanced.sh @@ -9,25 +9,25 @@ revanced_dl(){ revanced_dl # Patch YouTube: get_patches_key "youtube-revanced" - get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" + get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + split_editor "youtube" "youtube" patch "youtube" "revanced" - # Patch YouTube Music: - # Arm64-v8a - get_patches_key "youtube-music-revanced" - get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" - patch "youtube-music-arm64-v8a" "revanced" - # Armeabi-v7a - get_patches_key "youtube-music-revanced" - get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" - patch "youtube-music-armeabi-v7a" "revanced" - # Split architecture: - rm -f revanced-cli* revanced-patches*.jar *.json - dl_gh "revanced-cli" "inotia00" "latest" - dl_gh "revanced-patches" "inotia00" "latest" - # Split architecture Youtube: - for i in {0..3}; do - split_arch "youtube-revanced" "youtube-${archs[i]}-revanced" "$(gen_rip_libs ${libs[i]})" - done + # Patch Youtube Arm64-v8a + get_patches_key "youtube-revanced" + split_editor "youtube" "youtube-arm64-v8a" "exclude" "split_config.armeabi_v7a split_config.x86 split_config.x86_64" + patch "youtube-arm64-v8a" "revanced" + # Patch Youtube Armeabi-v7a + get_patches_key "youtube-revanced" + split_editor "youtube" "youtube-armeabi-v7a" "exclude" "split_config.arm64_v8a split_config.x86 split_config.x86_64" + patch "youtube-armeabi-v7a" "revanced" + # Patch Youtube x86 + get_patches_key "youtube-revanced" + split_editor "youtube" "youtube-x86" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86_64" + patch "youtube-x86" "revanced" + # Patch Youtube x86_64 + get_patches_key "youtube-revanced" + split_editor "youtube" "youtube-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86" + patch "youtube-x86_64" "revanced" } 2() { revanced_dl @@ -53,7 +53,6 @@ revanced_dl(){ patch "gg-photos-arm64-v8a" "revanced" # Armeabi-v7a get_patches_key "gg-photos" - version="6.94.0.662644291" get_apk "com.google.android.apps.photos" "gg-photos-armeabi-v7a" "photos" "google-inc/photos/photos" "armeabi-v7a" "nodpi" patch "gg-photos-armeabi-v7a" "revanced" } @@ -102,6 +101,29 @@ revanced_dl(){ get_apk "com.adobe.lrmobile" "lightroom" "lightroom" "adobe/lightroom/lightroom" "Bundle" patch "lightroom" "revanced" } +8() { + revanced_dl + get_apk "com.google.android.youtube" "youtube-lite" "youtube" "google-inc/youtube/youtube" "Bundle_extract" + # Patch YouTube Lite Arm64-v8a: + get_patches_key "youtube-revanced" + split_editor "youtube-lite" "youtube-lite-arm64-v8a" "include" "split_config.arm64_v8a split_config.en split_config.xxxhdpi" + patch "youtube-lite-arm64-v8a" "revanced" + # Patch YouTube Lite Armeabi-v7a: + get_patches_key "youtube-revanced" + split_editor "youtube-lite" "youtube-lite-armeabi-v7a" "include" "split_config.armeabi_v7a split_config.en split_config.xxxhdpi" + patch "youtube-lite-armeabi-v7a" "revanced" +} +9() { + # Patch YouTube Music: + # Arm64-v8a + get_patches_key "youtube-music-revanced" + get_apk "com.google.android.apps.youtube.music" "youtube-music-arm64-v8a" "youtube-music" "google-inc/youtube-music/youtube-music" "arm64-v8a" + patch "youtube-music-arm64-v8a" "revanced" + # Armeabi-v7a + get_patches_key "youtube-music-revanced" + get_apk "com.google.android.apps.youtube.music" "youtube-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a" + patch "youtube-music-armeabi-v7a" "revanced" +} case "$1" in 1) 1 @@ -124,4 +146,10 @@ case "$1" in 7) 7 ;; + 8) + 8 + ;; + 9) + 9 + ;; esac diff --git a/src/build/Rufusin-Revanced-Extended.sh b/src/build/Rufusin-Revanced-Extended.sh deleted file mode 100644 index ca81a2c..0000000 --- a/src/build/Rufusin-Revanced-Extended.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash -# Revanced Extended forked by Rufusin build -source src/build/utils.sh - -################################################# - -# Download requirements -dl_gh "revanced-patches revanced-integrations" "rufusin" "latest" -dl_gh "revanced-cli" "revanced" "latest" - -################################################# - -# Patch YouTube Rufusin: -get_patches_key "youtube-rve-rufusin" -get_apk "com.google.android.youtube" "youtube" "youtube" "google-inc/youtube/youtube" -patch "youtube" "rufusin" - -################################################# - -rm -f revanced-cli* revanced-patches*.jar *.json -dl_gh "revanced-cli" "inotia00" "latest" -dl_gh "revanced-patches" "inotia00" "latest" -# Split architecture Youtube: -for i in {0..3}; do - split_arch "youtube-rufusin" "youtube-${archs[i]}-rufusin" "$(gen_rip_libs ${libs[i]})" -done - -################################################# \ No newline at end of file diff --git a/src/build/utils.sh b/src/build/utils.sh index 378b7a5..28e599b 100644 --- a/src/build/utils.sh +++ b/src/build/utils.sh @@ -137,12 +137,12 @@ _req() { fi } req() { - _req "$1" "$2" "User-Agent: Mozilla/5.0 (Linux; Android 13) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.6099.231 Mobile Safari/537.36" + _req "$1" "$2" "User-Agent: Mozilla/5.0 (Linux; Android 10; K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/130.0.6723.58 Mobile Safari/537.36" } dl_apk() { local url=$1 regexp=$2 output=$3 - if [[ -z "$4" ]] || [[ $4 == "Bundle" ]]; then + if [[ -z "$4" ]] || [[ $4 == "Bundle" ]] || [[ $4 == "Bundle_extract" ]]; then url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/.*]*href=\"\([^\"]*\)\".*${regexp}.*/\1/p")" else url="https://www.apkmirror.com$(req "$url" - | tr '\n' ' ' | sed -n "s/href=\"/@/g; s;.*${regexp}.*;\1;p")" @@ -154,7 +154,7 @@ dl_apk() { get_apk() { if [[ -z $5 ]]; then url_regexp='APK<\/span>' - elif [[ $5 == "Bundle" ]]; then + elif [[ $5 == "Bundle" ]] || [[ $5 == "Bundle_extract" ]]; then url_regexp='BUNDLE<\/span>' else case $5 in @@ -183,7 +183,7 @@ get_apk() { fi version=$(echo "$version" | tr -d ' ' | sed 's/\./-/g') green_log "[+] Downloading $3 version: $version $5 $6 $7" - if [[ $5 == "Bundle" ]]; then + if [[ $5 == "Bundle" ]] || [[ $5 == "Bundle_extract" ]]; then local base_apk="$2.apkm" else local base_apk="$2.apk" @@ -208,6 +208,8 @@ get_apk() { if [[ $5 == "Bundle" ]]; then green_log "[+] Merge splits apk to standalone apk" java -jar $APKEditor m -i ./download/$2.apkm -o ./download/$2.apk > /dev/null 2>&1 + elif [[ $5 == "Bundle_extract" ]]; then + unzip "./download/$base_apk" -d "./download/$(basename "$base_apk" .apkm)" > /dev/null 2>&1 fi } @@ -251,26 +253,32 @@ patch() { ################################################# -# Split architectures using Revanced CLI, created by inotia00 -archs=("arm64-v8a" "armeabi-v7a" "x86_64" "x86") -libs=("armeabi-v7a x86_64 x86" "arm64-v8a x86_64 x86" "armeabi-v7a arm64-v8a x86" "armeabi-v7a arm64-v8a x86_64") -gen_rip_libs() { - for lib in $@; do - echo -n "--rip-lib "$lib" " - done +split_editor() { + if [[ -z "$3" || -z "$4" ]]; then + green_log "[+] Merge splits apk to standalone apk" + java -jar $APKEditor m -i "./download/$1" -o "./download/$1.apk" > /dev/null 2>&1 + return 0 + fi + IFS=' ' read -r -a include_files <<< "$4" + mkdir -p "./download/$2" + for file in "./download/$1"/*.apk; do + filename=$(basename "$file") + basename_no_ext="${filename%.apk}" + if [[ "$filename" == "base.apk" ]]; then + cp -f "$file" "./download/$2/" > /dev/null 2>&1 + continue + fi + if [[ "$3" == "include" ]]; then + if [[ " ${include_files[*]} " =~ " ${basename_no_ext} " ]]; then + cp -f "$file" "./download/$2/" > /dev/null 2>&1 + fi + elif [[ "$3" == "exclude" ]]; then + if [[ ! " ${include_files[*]} " =~ " ${basename_no_ext} " ]]; then + cp -f "$file" "./download/$2/" > /dev/null 2>&1 + fi + fi + done + + green_log "[+] Merge splits apk to standalone apk" + java -jar $APKEditor m -i ./download/$2 -o ./download/$2.apk > /dev/null 2>&1 } -split_arch() { - green_log "[+] Splitting $1 to ${archs[i]}:" - if [ -f "./release/$1.apk" ]; then - eval java -jar revanced-cli*.jar patch \ - --patch-bundle revanced-patches*.jar \ - $3 \ - --keystore=./src/_ks.keystore \ - --out=./release/$2.apk\ - ./release/$1.apk - else - red_log "[-] Not found $1.apk" - exit 1 - fi -} -################################################# diff --git a/src/options/ReX.json b/src/options/ReX.json deleted file mode 100644 index 0637a08..0000000 --- a/src/options/ReX.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/src/options/rufusin.json b/src/options/rufusin.json deleted file mode 100644 index 0637a08..0000000 --- a/src/options/rufusin.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/src/patches/youtube-ReX/exclude-patches b/src/patches/youtube-ReX/exclude-patches deleted file mode 100644 index 2ef084c..0000000 --- a/src/patches/youtube-ReX/exclude-patches +++ /dev/null @@ -1,2 +0,0 @@ -Custom branding icon YouTube -Translations diff --git a/src/patches/youtube-ReX/include-patches b/src/patches/youtube-ReX/include-patches deleted file mode 100644 index e69de29..0000000 diff --git a/src/patches/youtube-music-ReX/exclude-patches b/src/patches/youtube-music-ReX/exclude-patches deleted file mode 100644 index e763416..0000000 --- a/src/patches/youtube-music-ReX/exclude-patches +++ /dev/null @@ -1 +0,0 @@ -Custom branding icon YouTube Music diff --git a/src/patches/youtube-music-ReX/include-patches b/src/patches/youtube-music-ReX/include-patches deleted file mode 100644 index e69de29..0000000 diff --git a/src/patches/youtube-rve-rufusin/exclude-patches b/src/patches/youtube-rve-rufusin/exclude-patches deleted file mode 100644 index 2ef084c..0000000 --- a/src/patches/youtube-rve-rufusin/exclude-patches +++ /dev/null @@ -1,2 +0,0 @@ -Custom branding icon YouTube -Translations diff --git a/src/patches/youtube-rve-rufusin/include-patches b/src/patches/youtube-rve-rufusin/include-patches deleted file mode 100644 index e69de29..0000000