From ea63ce29bcbd8c8ff7fa69577d5e37e6b13e6363 Mon Sep 17 00:00:00 2001
From: siritami <102145692+FiorenMas@users.noreply.github.com>
Date: Sun, 31 Mar 2024 11:37:58 +0700
Subject: [PATCH] Swtitch to ncipollo/release-action

- softprops/action-gh-release too outdate so switch to ncipollo/release-action
- fix bugs about download function
- bump tumblr version
---
 .github/actions/release/action.yml | 18 +++++++++++-------
 src/build/Revanced-3.sh            |  1 -
 src/build/Revanced-Beta-3.sh       |  1 -
 src/build/utils.sh                 |  6 +++---
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/.github/actions/release/action.yml b/.github/actions/release/action.yml
index 56b5963..67d1bb3 100644
--- a/.github/actions/release/action.yml
+++ b/.github/actions/release/action.yml
@@ -7,15 +7,19 @@ runs:
       run: |
         echo "
         **Change log** :point_down:
-        [Revanced](https://github.com/revanced/revanced-patches/releases/latest)
-        [Revanced Extended](https://github.com/inotia00/revanced-patches/releases/latest)
-        [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases/latest)
+        [Revanced](https://github.com/revanced/revanced-patches/releases)
+        [Revanced Extended](https://github.com/inotia00/revanced-patches/releases)
+        [ReX](https://github.com/YT-Advanced/ReX-patches/releases)
+        [ReX forked by anddea](https://github.com/anddea/revanced-patches/releases)
+        [Revanced Extended for Android 6 & 7](https://github.com/kitadai31/revanced-patches-android6-7/releases)
+        [Revanced Extended For Android 5:](https://github.com/d4n3436/revanced-patches-android5/releases)
         "> ${{ github.workspace }}-CHANGELOG.txt
     - name: Release
-      uses: softprops/action-gh-release@v0.1.15
+      uses: ncipollo/release-action@v1.14.0
       with:
-        files: |
+        artifacts: |
           ./release/*.apk
         name: Revanced & Revanced Extended
-        tag_name: all
-        body_path: ${{ github.workspace }}-CHANGELOG.txt
+        tag: all
+        bodyFile: ${{ github.workspace }}-CHANGELOG.txt
+        allowUpdates: true
diff --git a/src/build/Revanced-3.sh b/src/build/Revanced-3.sh
index 7b57e7b..0b79b39 100644
--- a/src/build/Revanced-3.sh
+++ b/src/build/Revanced-3.sh
@@ -41,7 +41,6 @@ patch "windy" "revanced"
 
 # Patch Tumblr:
 get_patches_key "tumblr"
-version="33.2.0.110"
 get_apk "tumblr" "tumblr" "tumblr-inc/tumblr/tumblr"
 patch "tumblr" "revanced"
 
diff --git a/src/build/Revanced-Beta-3.sh b/src/build/Revanced-Beta-3.sh
index db8278c..e4bdcf0 100644
--- a/src/build/Revanced-Beta-3.sh
+++ b/src/build/Revanced-Beta-3.sh
@@ -42,7 +42,6 @@ patch "windy" "revanced"
 
 # Patch Tumblr:
 get_patches_key "tumblr"
-version="33.2.0.110"
 get_apk "tumblr-beta" "tumblr" "tumblr-inc/tumblr/tumblr"
 patch "tumblr-beta" "revanced"
 
diff --git a/src/build/utils.sh b/src/build/utils.sh
index 7751228..6535bc2 100644
--- a/src/build/utils.sh
+++ b/src/build/utils.sh
@@ -148,14 +148,14 @@ get_apk() {
 	local attempt=0
 	while [ $attempt -lt 10 ]; do
 		if [[ -z $version ]] || [ $attempt -ne 0 ]; then
-			local list_vers v versions=()
+			local list_vers v _versions=() IFS=$'\n'
 			list_vers=$(req "https://www.apkmirror.com/uploads/?appcategory=$2" -)
 			version=$(sed -n 's;.*Version:</span><span class="infoSlide-value">\(.*\) </span>.*;\1;p' <<<"$list_vers")
 			version=$(grep -iv "\(beta\|alpha\)" <<<"$version")
 			for v in $version; do
-				grep -iq "${v} \(beta\|alpha\)" <<<"$list_vers" || versions+=("$v")
+				grep -iq "${v} \(beta\|alpha\)" <<<"$list_vers" || _versions+=("$v")
 			done
-			version=$(echo -e "$version" | sed -n "$((attempt + 1))p")
+			version=$(echo -e "${_versions[*]}" | sed -n "$((attempt + 1))p")
 		fi
 		green_log "[+] Downloading $2 version: $version $4 $5 $6"
 		local base_apk="$1.apk"