From e4832e5fd9a5a11e65bff38095cf3294eb8fa357 Mon Sep 17 00:00:00 2001
From: siritami <102145692+FiorenMas@users.noreply.github.com>
Date: Tue, 10 Oct 2023 11:33:26 +0700
Subject: [PATCH] bump compatibility RVE cli v4.0.2

---
 src/build/Revanced-Extended.sh |  8 ++++----
 src/build/utils.sh             | 33 +++++++++++++++++----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh
index 95306a0..ddb7fe1 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" "rve"
 
 #################################################
 
@@ -27,19 +27,19 @@ patch "youtube" "revanced-extended"
 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" "rve"
 # 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" "rve"
 
 #################################################
 
 # Patch Reddit:
 get_patches_key "reddit"
 get_apk "reddit" "reddit" "redditinc/reddit/reddit"
-patch "reddit" "revanced-extended"
+patch "reddit" "revanced-extended" "rve"
 
 #################################################
 
diff --git a/src/build/utils.sh b/src/build/utils.sh
index 9717d2d..5d73880 100644
--- a/src/build/utils.sh
+++ b/src/build/utils.sh
@@ -127,8 +127,8 @@ get_apk() {
 
 # Patching apps with Revanced CLI:
 patch() {
-	if [ -f "$1.apk" ]; then
-		local p b m ks a
+	local p b m ks a
+	if [[ -z $3 ]]; then
 		if [[ $(ls revanced-cli-*.jar) =~ revanced-cli-([0-9]+) ]]; then
 			num=${BASH_REMATCH[1]}
 			if [ $num -ge 4 ]; then
@@ -148,21 +148,22 @@ patch() {
 			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 \
-		--out=./release/$1-$2.apk \
-		--keystore=./src/$ks.keystore \
-		$a$1.apk
-		unset version
-		unset EXCLUDE_PATCHES
-		unset INCLUDE_PATCHES
-	else 
-		exit 1
+	else
+		echo "Patching with Revanced-cli inotia version 4+"
+		p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks"
 	fi
+	java -jar revanced-cli*.jar $p\
+	$b revanced-patches*.jar \
+	$m revanced-integrations*.apk \
+	${EXCLUDE_PATCHES[@]} \
+	${INCLUDE_PATCHES[@]} \
+	--options=./src/options/$2.json \
+	--out=./release/$1-$2.apk \
+	--keystore=./src/$ks.keystore \
+	$a$1.apk
+	unset version
+	unset EXCLUDE_PATCHES
+	unset INCLUDE_PATCHES
 }
 
 #################################################