From 130a9a9ad15ff1a48f815fe4be4dc05c2db9c4b3 Mon Sep 17 00:00:00 2001
From: Fioren <102145692+FiorenMas@users.noreply.github.com>
Date: Fri, 19 May 2023 00:24:08 +0700
Subject: [PATCH] Update

---
 src/build/build-rv.sh              | 19 ++++++++++++-------
 src/build/build-rve-android-6-7.sh | 17 +++++++++++------
 src/build/build-rve.sh             | 19 ++++++++++++-------
 3 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/src/build/build-rv.sh b/src/build/build-rv.sh
index a5b3b1e..726d175 100644
--- a/src/build/build-rv.sh
+++ b/src/build/build-rv.sh
@@ -2,14 +2,19 @@
 # Revanced build
 source src/build/tools.sh
 
-curl -sL -O $(curl -s "https://api.github.com/repos/revanced/revanced-patches/releases/latest" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
+release=$(curl -s "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 -sL -O "$asset"
 ls revanced-patches*.jar >> new.txt
-curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
+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-version.txt") | .browser_download_url')
+curl -sL -O "$asset"
 if diff -q revanced-version.txt new.txt >/dev/null ; then
-rm -f ./revanced-patches*.jar ./*.txt
 echo "Old patch!!! Not build"
 exit 0
 else
+rm -f *.txt
 
 dl_gh "revanced-patches revanced-cli revanced-integrations" "revanced" "latest"
 
@@ -60,7 +65,7 @@ get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-m
 patch "youtube-music" "youtube-music-revanced"
 
 # Patch Twitter
-rm -f ./revanced-integrations*.apk
+rm -f revanced-integrations*.apk
 dl_gh "revanced-integrations" "revanced" "tags/v0.103.0"
 get_patches_key "twitter"
 version="9.86.0-release.0"
@@ -68,11 +73,11 @@ get_apk "twitter" "twitter" "twitter-inc/twitter/twitter"
 patch "twitter" "twitter-revanced"
 
 # Change architecture
-rm -f ./revanced-cli*
+rm -f revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
 for i in {0..3}; do
-	change_arch "youtube-revanced" "youtube-revanced-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    change_arch "youtube-revanced" "youtube-revanced-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
 done
 
 ls revanced-patches*.jar >> revanced-version.txt
-fi
\ No newline at end of file
+fi
diff --git a/src/build/build-rve-android-6-7.sh b/src/build/build-rve-android-6-7.sh
index 3d520d8..a59a31f 100644
--- a/src/build/build-rve-android-6-7.sh
+++ b/src/build/build-rve-android-6-7.sh
@@ -2,14 +2,19 @@
 # Revanced Extended for android 6 & 7 build
 source src/build/tools.sh
 
-curl -sL -O $(curl -s "https://api.github.com/repos/kitadai31/revanced-patches-android6-7/releases/latest" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
+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
-curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
-if diff -q revanced-version.txt new.txt >/dev/null ; then
-rm -f ./revanced-patches*.jar ./*.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
 
 dl_gh "revanced-patches-android6-7 revanced-integrations" "kitadai31" "latest"
 dl_gh "revanced-cli" "inotia00" "latest"
@@ -22,10 +27,10 @@ get_apk "youtube" "youtube" "google-inc/youtube/youtube"
 patch "youtube" "youtube-revanced-extended-android-6-7"
 
 # Change architecture
-rm -f ./revanced-cli*
+rm -f revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
 for i in {0..3}; do
-	change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    change_arch "youtube-revanced-extended-android-6-7" "youtube-revanced-extended-android-6-7-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
 done
 
 ls revanced-patches*.jar >> revanced-extended-android-6-7-version.txt
diff --git a/src/build/build-rve.sh b/src/build/build-rve.sh
index 41b5e89..13015cf 100644
--- a/src/build/build-rve.sh
+++ b/src/build/build-rve.sh
@@ -2,14 +2,19 @@
 # Revanced Extended build
 source src/build/tools.sh
 
-curl -sL -O $(curl -s "https://api.github.com/repos/inotia00/revanced-patches/releases/latest" | jq -r '.assets[] | select(.name | test("revanced-patches.*\\.jar$")) | .browser_download_url')
+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
-curl -sL -O $(curl -s "https://api.github.com/repos/$repository/releases/latest" | jq -r '.assets[] | select(.name == "revanced-version.txt") | .browser_download_url')
-if diff -q revanced-version.txt new.txt >/dev/null ; then
-rm -f ./revanced-patches*.jar ./*.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
 
 dl_gh "revanced-patches revanced-cli revanced-integrations" "inotia00" "latest"
 
@@ -27,11 +32,11 @@ get_apk_arch "youtube-music" "youtube-music" "google-inc/youtube-music/youtube-m
 patch "youtube-music" "youtube-music-revanced-extended"
 
 # Change architecture
-rm -f ./revanced-cli*
+rm -f revanced-cli*
 dl_gh "revanced-cli" "j-hc" "latest"
 for i in {0..3}; do
-	change_arch "youtube-revanced-extended" "youtube-revanced-extended-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
+    change_arch "youtube-revanced-extended" "youtube-revanced-extended-${archs[i]}" "$(gen_rip_libs ${libs[i]})"
 done
 
 ls revanced-patches*.jar >> revanced-extended-version.txt
-fi
\ No newline at end of file
+fi