From 2612cb53b8c2a37c8fae0d157dd59f6ca9e991d5 Mon Sep 17 00:00:00 2001
From: siritami <102145692+FiorenMas@users.noreply.github.com>
Date: Tue, 10 Oct 2023 13:25:16 +0700
Subject: [PATCH] revert change

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

diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh
index c8ce284..d3158f9 100644
--- a/src/build/Revanced-Extended.sh
+++ b/src/build/Revanced-Extended.sh
@@ -10,7 +10,8 @@ checker "inotia00/revanced-patches" "revanced-extended"
 #################################################
 
 # Download requirements
-dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
+dl_gh "revanced-patches revanced-integrations" "inotia00" "latest"
+dl_gh "revanced-cli" "revanced" "latest"
 
 #################################################
 
@@ -18,7 +19,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" "rve"
+patch "youtube" "revanced-extended"
 
 #################################################
 
@@ -27,29 +28,29 @@ patch "youtube" "revanced-extended" "rve"
 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" "rve"
+patch "youtube-music-arm64-v8a" "revanced-extended"
 # 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" "rve"
+patch "youtube-music-armeabi-v7a" "revanced-extended"
 
 #################################################
 
 # Patch Reddit:
 get_patches_key "reddit"
 get_apk "reddit" "reddit" "redditinc/reddit/reddit"
-patch "reddit" "revanced-extended" "rve"
+patch "reddit" "revanced-extended"
 
 #################################################
 
 # Split architecture:
 rm -f revanced-cli* revanced-patches*.jar patches.json 
 dl_gh "revanced-cli" "j-hc" "latest"
-dl_gh "revanced-patches" "inotia00" "latest"
+dl_gh "revanced-patches" "revanced" "latest"
 # 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
diff --git a/src/build/utils.sh b/src/build/utils.sh
index 5d73880..9717d2d 100644
--- a/src/build/utils.sh
+++ b/src/build/utils.sh
@@ -127,8 +127,8 @@ get_apk() {
 
 # Patching apps with Revanced CLI:
 patch() {
-	local p b m ks a
-	if [[ -z $3 ]]; then
+	if [ -f "$1.apk" ]; then
+		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
@@ -148,22 +148,21 @@ patch() {
 			echo "No revanced-cli supported"
 			exit 1
 		fi
-	else
-		echo "Patching with Revanced-cli inotia version 4+"
-		p="patch " b="--patch-bundle" m="--merge" a="" ks="_ks"
+		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
 	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
 }
 
 #################################################