fix

.github/workflows/manual-patch.yml

@@ -83,93 +83,173 @@ jobs:
     name: Patch RVX Anddea Stable
     if: ${{ github.event.inputs.org == 'RVE-anddea-stable' || inputs.org == 'RVE-anddea-stable' }}
     runs-on: ubuntu-latest
-    strategy:
+    container:
-      matrix:
+      image: ubuntu:20.04
-        run: [1, 2, 3]
+      options: --user root
     steps:
       - name: Checkout
         uses: actions/checkout@v4.2.2
       - name: Preparing to patch
         uses: ./.github/actions/preparing
+      - name: Install library
+        run: |
+          apt-get update
+          apt-get install -y curl jq wget
       - name: Check github connection
         id: check-gh-rve-anddea-stable
         run: bash src/etc/connection.sh
       - 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 ${{ matrix.run }}
+        run: bash src/build/Anddea-Revanced-Extended.sh
+      - name: Cache
+        uses: actions/upload-artifact@v4
+        with:
+          name: Cache_anddea_stable
+          path: |
+            ./release/*.apk
+  release_rve_anddea_stable:
+    name: Release RVX Anddea Stable
+    needs: patch_rve_anddea_stable
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Cache
+        uses: actions/download-artifact@v4
+        with:
+          name: Cache_anddea_stable
+          path: ./release
       - name: Releasing APK files
-        id: release-rve-anddea-stable
-        if: steps.check-gh-rve-anddea-stable.outputs.internet_error == '0'
         uses: ./.github/actions/release
   patch_rve_anddea_beta:
     name: Patch RVX Anddea Beta version
     if: ${{ github.event.inputs.org == 'RVE-anddea-beta' || inputs.org == 'RVE-anddea-beta' }}
     runs-on: ubuntu-latest
-    strategy:
+    container:
-      matrix:
+      image: ubuntu:20.04
-        run: [1, 2, 3]
+      options: --user root
     steps:
       - name: Checkout
         uses: actions/checkout@v4.2.2
       - name: Preparing to patch
         uses: ./.github/actions/preparing
+      - name: Install library
+        run: |
+          apt-get update
+          apt-get install -y curl jq wget
       - name: Check github connection
         id: check-gh-rve-anddea-beta
         run: bash src/etc/connection.sh
       - 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-Beta.sh ${{ matrix.run }}
+        run: bash src/build/Anddea-Revanced-Extended-Beta.sh
+      - name: Cache
+        uses: actions/upload-artifact@v4
+        with:
+          name: Cache_anddea_beta
+          path: |
+            ./release/*.apk
+  release_rve_anddea_beta:
+    name: Release RVX Anddea Beta
+    needs: patch_rve_anddea_beta
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Cache
+        uses: actions/download-artifact@v4
+        with:
+          name: Cache_anddea_beta
+          path: ./release
       - name: Releasing APK files
-        id: release-rve-anddea-beta
-        if: steps.check-gh-rve-anddea-beta.outputs.internet_error == '0'
         uses: ./.github/actions/release
   patch_rve:
     name: Patch Revanced Extended Stable
     if: ${{ github.event.inputs.org == 'Revanced Extended' || inputs.org == 'Revanced Extended' }}
     runs-on: ubuntu-latest
-    strategy:
+    container:
-      matrix:
+      image: ubuntu:20.04
-        run: [1, 2, 3]
+      options: --user root
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v2
       - name: Preparing to patch
         uses: ./.github/actions/preparing
+      - name: Install library
+        run: |
+          apt-get update
+          apt-get install -y curl jq wget
       - name: Check github connection
         id: check-gh-rve
         run: bash src/etc/connection.sh
       - name: Patch apk
         id: patch-rve
         if: steps.check-gh-rve.outputs.internet_error == '0'
-        run: bash src/build/Revanced-Extended.sh ${{ matrix.run }}
+        run: bash src/build/Revanced-Extended.sh
+      - name: Cache
+        uses: actions/upload-artifact@v4
+        with:
+          name: Cache_rve
+          path: |
+            ./release/*.apk
+  release_rve:
+    name: Release Revanced Extended Stable
+    needs: patch_rve
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Cache
+        uses: actions/download-artifact@v4
+        with:
+          name: Cache_rve
+          path: ./release
       - name: Releasing APK files
-        id: release-rve
-        if: steps.check-gh-rve.outputs.internet_error == '0'
         uses: ./.github/actions/release
   patch_rve_beta:
     name: Patch Revanced Extended Beta
     if: ${{ github.event.inputs.org == 'Revanced Extended Beta' || inputs.org == 'Revanced Extended Beta' }}
     runs-on: ubuntu-latest
-    strategy:
+    container:
-      matrix:
+      image: ubuntu:20.04
-        run: [1, 2, 3]
+      options: --user root
     steps:
       - name: Checkout
         uses: actions/checkout@v4.2.2
       - name: Preparing to patch
         uses: ./.github/actions/preparing
+      - name: Install library
+        run: |
+          apt-get update
+          apt-get install -y curl jq wget
       - name: Check github connection
         id: check-gh-rve-beta
         run: bash src/etc/connection.sh
       - 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 ${{ matrix.run }}
+        run: bash src/build/Revanced-Extended-Beta.sh
+      - name: Cache
+        uses: actions/upload-artifact@v4
+        with:
+          name: Cache_rve_beta
+          path: |
+            ./release/*.apk
+  release_rve_beta:
+    name: Release Revanced Extended Beta
+    needs: patch_rve_beta
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Cache
+        uses: actions/download-artifact@v4
+        with:
+          name: Cache_rve_beta
+          path: ./release
       - name: Releasing APK files
-        id: release-rve-beta
-        if: steps.check-gh-rve-beta.outputs.internet_error == '0'
         uses: ./.github/actions/release
   patch_twitter_piko_stable:
     name: Patch Twitter Piko Stable

README.md

@@ -71,10 +71,6 @@ Download
 
 </details>
 
-<details>
-
-<summary>Revanced Extended crashes on launch with the newest patch. Don't use it for now. I'll find a solution later.</summary>
-
 ### [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)                     |
@@ -115,8 +111,6 @@ Download
 
 </details>
 
-</details>
-
 ### [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)

src/build/Anddea-Revanced-Extended-Beta.sh

@@ -2,13 +2,9 @@
 # Revanced Extended forked by Anddea build
 source src/build/utils.sh
 # Download requirements
-revanced_dl(){
 dl_gh "revanced-patches" "anddea" "prerelease"
 dl_gh "revanced-cli" "inotia00" "latest"
-}
 
-1() {
-	revanced_dl
 #Disabled because lastest RVE Anddea patch youtube not have splits apk on APKMirror
 # Patch YouTube:
 #get_patches_key "youtube-rve-anddea"
@@ -40,9 +36,7 @@ revanced_dl(){
 for i in {0..3}; do
 split_arch "youtube-beta" "anddea" "$(gen_rip_libs ${libs[i]})"
 done
-}
+
-2() {
-	revanced_dl
 # Patch YouTube Music Extended:
 # Arm64-v8a
 get_patches_key "youtube-music-rve-anddea"
@@ -52,9 +46,7 @@ revanced_dl(){
 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
 #Disabled because lastest RVE Anddea patch youtube not have splits apk on APKMirror
 #get_apk "com.google.android.youtube" "youtube-lite-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract"
 # Patch YouTube Lite Arm64-v8a:
@@ -65,15 +57,3 @@ revanced_dl(){
 #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

src/build/Anddea-Revanced-Extended.sh

@@ -2,13 +2,9 @@
 # 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" "revanced" "v4.6.0"
-}
 
-1() {
-	revanced_dl
 # Patch YouTube:
 get_patches_key "youtube-rve-anddea"
 get_apk "com.google.android.youtube" "youtube-stable" "youtube" "google-inc/youtube/youtube" "Bundle_extract"
@@ -30,9 +26,7 @@ revanced_dl(){
 get_patches_key "youtube-rve-anddea"
 split_editor "youtube-stable" "youtube-stable-x86_64" "exclude" "split_config.arm64_v8a split_config.armeabi_v7a split_config.x86"
 patch "youtube-stable-x86_64" "anddea"
-}
+
-2() {
-	revanced_dl
 # Patch YouTube Music Extended:
 # Arm64-v8a
 get_patches_key "youtube-music-rve-anddea"
@@ -42,9 +36,7 @@ revanced_dl(){
 get_patches_key "youtube-music-rve-anddea"
 get_apk "com.google.android.apps.youtube.music" "youtube-music-stable-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 patch "youtube-music-stable-armeabi-v7a" "anddea"
-}
+
-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"
@@ -54,15 +46,3 @@ revanced_dl(){
 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"
-}
-case "$1" in
-    1)
-        1
-        ;;
-    2)
-        2
-        ;;
-    3)
-        3
-        ;;
-esac

src/build/Revanced-Extended-Beta.sh

@@ -3,12 +3,8 @@
 source src/build/utils.sh
 
 # Download requirements
-revanced_dl(){
 dl_gh "revanced-patches revanced-cli" "inotia00" "prerelease"
-}
 
-1() {
-	revanced_dl
 #Disabled because lastest RVE patch youtube not have splits apk on APKMirror
 # Patch YouTube:
 #get_patches_key "youtube-revanced-extended"
@@ -40,9 +36,7 @@ revanced_dl(){
 for i in {0..3}; do
 split_arch "youtube-beta" "revanced-extended" "$(gen_rip_libs ${libs[i]})"
 done
-}
+
-2() {
-	revanced_dl
 # Patch YouTube Music Extended:
 # Arm64-v8a
 get_patches_key "youtube-music-revanced-extended"
@@ -52,13 +46,11 @@ revanced_dl(){
 get_patches_key "youtube-music-revanced-extended"
 get_apk "com.google.android.apps.youtube.music" "youtube-beta-music-armeabi-v7a" "youtube-music" "google-inc/youtube-music/youtube-music" "armeabi-v7a"
 patch "youtube-beta-music-armeabi-v7a" "revanced-extended" "inotia"
-}
+
-3() {
-	revanced_dl
 # Patch Reddit:
 get_patches_key "reddit-rve"
 get_apk "com.reddit.frontpage" "reddit-beta" "reddit" "redditinc/reddit/reddit" "Bundle"
-	patch "reddit-beta" "revanced-extended"
+patch "reddit-beta" "revanced-extended" "inotia"
 #Disabled because lastest RVE patch youtube not have splits apk on APKMirror
 #get_apk "com.google.android.youtube" "youtube-lite-beta" "youtube" "google-inc/youtube/youtube" "Bundle_extract"
 # Patch YouTube Lite Arm64-v8a:
@@ -69,15 +61,3 @@ revanced_dl(){
 #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

src/build/Revanced-Extended.sh

@@ -3,12 +3,8 @@
 source src/build/utils.sh
 
 # Download requirements
-revanced_dl(){
 dl_gh "revanced-patches revanced-cli" "inotia00" "latest"
-}
 
-1() {
-	revanced_dl
 #Disabled because lastest RVE patch youtube not have splits apk on APKMirror
 # Patch YouTube:
 #get_patches_key "youtube-revanced-extended"
@@ -40,9 +36,7 @@ revanced_dl(){
 for i in {0..3}; do
 	split_arch "youtube" "revanced-extended" "$(gen_rip_libs ${libs[i]})"
 done
-}
+
-2() {
-	revanced_dl
 # Patch YouTube Music Extended:
 # Arm64-v8a
 get_patches_key "youtube-music-revanced-extended"
@@ -52,13 +46,11 @@ revanced_dl(){
 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
 # Patch Reddit:
 get_patches_key "reddit-rve"
 get_apk "com.reddit.frontpage" "reddit" "reddit" "redditinc/reddit/reddit" "Bundle"
-	patch "reddit" "revanced-extended"
+patch "reddit" "revanced-extended" "inotia"
 #Disabled because lastest RVE patch youtube not have splits apk on APKMirror
 #get_apk "com.google.android.youtube" "youtube-lite" "youtube" "google-inc/youtube/youtube" "Bundle_extract"
 # Patch YouTube Lite Arm64-v8a:
@@ -69,15 +61,3 @@ revanced_dl(){
 #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

src/build/utils.sh

@@ -283,7 +283,9 @@ patch() {
 				fi
 			fi
 		fi
-  		unset GITHUB_REPOSITORY
+		if [ "$3" = inotia ]; then
+			unset CI GITHUB_ACTION GITHUB_ACTIONS GITHUB_ACTOR GITHUB_ENV GITHUB_EVENT_NAME GITHUB_EVENT_PATH GITHUB_HEAD_REF GITHUB_JOB GITHUB_REF GITHUB_REPOSITORY GITHUB_RUN_ID GITHUB_RUN_NUMBER GITHUB_SHA GITHUB_WORKFLOW GITHUB_WORKSPACE RUN_ID RUN_NUMBER
+		fi
 		eval java -jar *cli*.jar $p$b $m$opt --out=./release/$1-$2.apk$excludePatches$includePatches --keystore=./src/$ks.keystore $pu $a./download/$1.apk
   		unset version
 		unset lock_version
@@ -340,7 +342,7 @@ gen_rip_libs() {
 split_arch() {
 	green_log "[+] Splitting $1 to ${archs[i]}:"
 	if [ -f "./download/$1.apk" ]; then
-		unset GITHUB_REPOSITORY
+		unset CI GITHUB_ACTION GITHUB_ACTIONS GITHUB_ACTOR GITHUB_ENV GITHUB_EVENT_NAME GITHUB_EVENT_PATH GITHUB_HEAD_REF GITHUB_JOB GITHUB_REF GITHUB_REPOSITORY GITHUB_RUN_ID GITHUB_RUN_NUMBER GITHUB_SHA GITHUB_WORKFLOW GITHUB_WORKSPACE RUN_ID RUN_NUMBER
 		eval java -jar revanced-cli*.jar patch \
 		-p *.rvp \
 		$3 \