fix bugs

- Remove things not need
- Chang patch function

src/build/ReX.sh

@@ -1,49 +0,0 @@
-#!/bin/bash
-# ReX build
-source src/build/utils.sh
-
-#################################################
-
-# Checking new patch
-checker "YT-Advanced/ReX-patches" "ReX"
-
-#################################################
-
-# Download requirements
-dl_gh "ReX-patches ReX-integrations" "YT-Advanced" "latest"
-dl_gh "revanced-cli" "revanced" "tags/v3.1.1"
-
-#################################################
-
-# Patch YouTube ReX:
-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 Music ReX:
-# Arm64-v8a
-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"
-# 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"
-
-#################################################
-
-# Split architecture:
-rm -f revanced-cli* revanced-patches*.jar patches.json 
-dl_gh "revanced-cli" "j-hc" "latest"
-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]})"
-done
-
-#################################################

src/build/Revanced-3.sh

@@ -53,13 +53,13 @@ dl_gh "revanced-cli" "revanced" "tags/v2.22.0"
 #Patch Tasker:
 get_patches_key "tasker"
 get_apk "tasker" "tasker" "joaomgcd/tasker/tasker"
-_patch "tasker" "revanced"
+patch "tasker" "revanced"
 
 #################################################
 
 #Patch Nova Launcher:
 get_patches_key "nova-launcher"
 get_apk "nova-launcher" "nova-launcher" "teslacoil-software/nova-launcher/nova-launcher"
-_patch "nova-launcher" "revanced"
+patch "nova-launcher" "revanced"
 
-#################################################
+#################################################

src/build/Revanced-Extended.sh

@@ -52,4 +52,4 @@ for i in {0..3}; do
     split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"
 done
 
-#################################################
+#################################################

src/build/utils.sh

@@ -128,34 +128,35 @@ 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 \
+		local p b m ks a
+		if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
+			num=${BASH_REMATCH[1]}
+			if [ $num -ge 4 ]; then
+				p="patch " b="--patch-bundle" m="--merge" a="" ks="ks"
+				echo "Patching with Revanced-cli version 4+"
+			elif [ $num -eq 3 ]; then
+				p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks"
+				echo "Patching with Revanced-cli version 3"
+			elif [ $num -eq 2 ]; then
+				p="" b="-b" m="-m" a="-a " ks="_ks"
+				echo "Patching with Revanced-cli version 2"
+			else
+				echo "No revanced-cli supported"
+				exit 1
+			fi
+		else
+			echo "No revanced-cli supported"
+			exit 1
+		fi
+		java -jar revanced-cli*.jar $p\
+		$b revanced-patches*.jar \
+		$m revanced-integrations*.apk \
 		${EXCLUDE_PATCHES[@]} \
 		${INCLUDE_PATCHES[@]} \
 		--options=./src/options/$2.json \
-		--keystore=./src/ks.keystore \
 		--out=./release/$1-$2.apk \
-		$1.apk
-		unset version
-		unset EXCLUDE_PATCHES
-		unset INCLUDE_PATCHES
-	else 
-		exit 1
-	fi
-}
-
-_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 ./release/$1-$2.apk
+		--keystore=./src/$ks.keystore \
+		$a$1.apk
 		unset version
 		unset EXCLUDE_PATCHES
 		unset INCLUDE_PATCHES
@@ -187,4 +188,4 @@ split_arch() {
 	fi
 }
 
-#################################################
+#################################################

src/options/revanced-extended-inotia-discontinued.json

@@ -1 +0,0 @@
-[]

src/patches/youtube-ReX/exclude-patches

@@ -1,23 +0,0 @@
-custom-branding-icon-revancify-blue
-enable-compact-controls-overlay
-hide-cast-button
-disable-QUIC-protocol
-disable-auto-captions
-enable-force-shuffle
-enable-old-quality-layout
-enable-zen-mode
-hide-account-menu
-hide-autoplay-button
-hide-autoplay-preview
-hide-button-container
-hide-captions-button
-hide-cast-button
-hide-description-components
-hide-handle
-hide-latest-videos-button
-hide-load-more-button
-hide-mix-playlists
-hide-previous-next-button
-hide-quick-actions
-higher-fullscreen-seekbar-height
-Custom-seekbar-color

src/patches/youtube-ReX/include-patches

@@ -1 +0,0 @@
-

src/patches/youtube-music-ReX/exclude-patches

@@ -1,7 +0,0 @@
-custom-branding-icon-revancify-blue
-disable-auto-captions
-hide-button-shelf
-hide-carousel-shelf
-hide-cast-button
-hide-category-bar
-hide-new-playlist-button

src/patches/youtube-music-ReX/include-patches

@@ -1 +0,0 @@
-