From d25b64585f77fe24a0c25f5444790a41623ccc10 Mon Sep 17 00:00:00 2001
From: siritami <102145692+FiorenMas@users.noreply.github.com>
Date: Mon, 19 Jun 2023 13:41:48 +0700
Subject: [PATCH] Update

---
 src/build/Revanced-Extended-Android-6-7.sh | 21 ++++-----------------
 src/build/Revanced-Extended.sh             | 21 ++++-----------------
 src/build/Revanced.sh                      | 21 ++++-----------------
 src/build/utils.sh                         | 18 ++++++++++++++++++
 4 files changed, 30 insertions(+), 51 deletions(-)

diff --git a/src/build/Revanced-Extended-Android-6-7.sh b/src/build/Revanced-Extended-Android-6-7.sh
index 07ad360..8d3b9aa 100644
--- a/src/build/Revanced-Extended-Android-6-7.sh
+++ b/src/build/Revanced-Extended-Android-6-7.sh
@@ -2,19 +2,9 @@
 # Revanced Extended for android 6 & 7 build
 source src/build/utils.sh
 
-release=$(curl -s "https://api.github.com/repos/kitadai31/revanced-patches-android6-7/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
-curl -sL -O "$asset"
-ls revanced-patches*.jar >> new.txt
-rm -f revanced-patches*.jar
-release=$(curl -s "https://api.github.com/repos/$repository/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-extended-android-6-7-version.txt") | .browser_download_url')
-curl -sL -O "$asset"
-if diff -q revanced-extended-android-6-7-version.txt new.txt >/dev/null ; then
-echo "Old patch!!! Not build"
-exit 0
-else
-rm -f ./*.txt
+#################################################
+
+checker "kitadai31/revanced-patches-android6-7" "revanced-extended-android-6-7"
 
 #################################################
 
@@ -40,7 +30,4 @@ 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
 
-#################################################
-
-ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt
-fi
\ No newline at end of file
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced-Extended.sh b/src/build/Revanced-Extended.sh
index 17eda3e..5b99f0b 100644
--- a/src/build/Revanced-Extended.sh
+++ b/src/build/Revanced-Extended.sh
@@ -2,19 +2,9 @@
 # Revanced Extended build
 source src/build/utils.sh
 
-release=$(curl -s "https://api.github.com/repos/inotia00/revanced-patches/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
-curl -sL -O "$asset"
-ls revanced-patches*.jar >> new.txt
-rm -f revanced-patches*.jar
-release=$(curl -s "https://api.github.com/repos/$repository/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-extended-version.txt") | .browser_download_url')
-curl -sL -O "$asset"
-if diff -q revanced-extended-version.txt new.txt >/dev/null ; then
-echo "Old patch!!! Not build"
-exit 0
-else
-rm -f ./*.txt
+#################################################
+
+checker "inotia00/revanced-patches" "revanced-extended"
 
 #################################################
 
@@ -53,7 +43,4 @@ for i in {0..3}; do
     split_arch "youtube-revanced-extended" "youtube-${archs[i]}-revanced-extended" "$(gen_rip_libs ${libs[i]})"
 done
 
-#################################################
-
-ls revanced-patches*.jar >> revanced-extended-version.txt
-fi
+#################################################
\ No newline at end of file
diff --git a/src/build/Revanced.sh b/src/build/Revanced.sh
index cd5cd38..87c0132 100644
--- a/src/build/Revanced.sh
+++ b/src/build/Revanced.sh
@@ -2,19 +2,9 @@
 # Revanced build
 source ./src/build/utils.sh
 
-release=$(curl -sL "https://api.github.com/repos/revanced/revanced-patches/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
-curl -sLO "$asset"
-ls revanced-patches*.jar >> new.txt
-rm -f revanced-patches*.jar
-release=$(curl -sL "https://api.github.com/repos/$repository/releases/latest")
-asset=$(echo "$release" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
-curl -sLO "$asset"
-if diff -q revanced-version.txt new.txt >/dev/null ; then
-echo "Old patch!!! Not build"
-exit 0
-else
-rm -f ./*.txt
+#################################################
+
+checker "revanced/revanced-patches" "revanced"
 
 #################################################
 
@@ -124,7 +114,4 @@ version="271.1.0.21.84"
 get_apk "instagram-armeabi-v7a" "instagram-instagram" "instagram/instagram-instagram/instagram-instagram" "armeabi-v7a"
 patch "instagram-armeabi-v7a" "instagram-armeabi-v7a-revanced"
 
-#################################################
-
-ls revanced-patches*.jar >> revanced-version.txt
-fi
+#################################################
\ No newline at end of file
diff --git a/src/build/utils.sh b/src/build/utils.sh
index 60c7e08..1f9fc96 100644
--- a/src/build/utils.sh
+++ b/src/build/utils.sh
@@ -2,6 +2,24 @@
 
 #################################################
 
+checker() {
+curl -sL https://api.github.com/repos/$1/releases/latest > json.txt
+latest_version=$(jq -r '.name' json.txt)
+echo $latest_version > latest-version.txt
+curl -sL "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "'$2'-version.txt") | .browser_download_url' | xargs curl -sLO
+cur_version=$(cat $2-version.txt)
+if [ "$latest_version" = "$cur_version" ]; then
+	echo "Old patch, not build!"
+	exit 0
+else
+	echo "New patch, building..."
+	rm -f ./$2-version.txt ./json.txt
+	mv latest-version.txt $2-version.txt
+fi
+}
+
+#################################################
+
 # Download Github assets requirement:
 dl_gh() {
 	for repo in $1 ; do