From d7d1cc4de1ffca73d7cbf82a0e39b93abb674499 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Thu, 16 Sep 2021 11:51:07 +0200
Subject: [PATCH] Fix

---
 .github/workflows/updater.sh | 22 +++++++++++++---------
 conf/arm64.src               |  1 -
 conf/arm7.src                |  1 -
 conf/x86-64.src              |  1 -
 4 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh
index 71c3762..d8f921e 100644
--- a/.github/workflows/updater.sh
+++ b/.github/workflows/updater.sh
@@ -20,9 +20,13 @@ exit 1
 current_version=$(cat manifest.json | jq -j '.version|split("~")[0]')
 repo=$(cat manifest.json | jq -j '.upstream.code|split("https://github.com/")[1]')
 # Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions)
-version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | .tag_name' | sort -V | tail -1)
+version=$(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '.[] | select( .prerelease != true ) | .tag_name' | sort -V | tail -1)
 assets=($(curl --silent "https://api.github.com/repos/$repo/releases" | jq -r '[ .[] | select(.tag_name=="'$version'").assets[].browser_download_url ] | join(" ") | @sh' | tr -d "'"))
 
+if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then
+     version=${version:1}
+fi
+
 # Setting up the environment variables
 echo "Current version: $current_version"
 echo "Latest release from upstream: $version"
@@ -59,14 +63,14 @@ echo "Handling asset at $asset_url"
 # Here we base the source file name upon a unique keyword in the assets url (admin vs. update)
 # Leave $src empty to ignore the asset
 case $asset_url in
-  *"admin"*)
-    src="app"
+  *".zip"*)
+    src="arm64"
     ;;
-  *"update"*)
-    src="app-upgrade"
+  *".zip"*)
+    src="arm7"
     ;;
-  *)
-    src=""
+  *".zip"*)
+    src="x86-64"
     ;;
 esac
 
@@ -97,8 +101,8 @@ SOURCE_URL=$asset_url
 SOURCE_SUM=$checksum
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=$extension
-SOURCE_IN_SUBDIR=true
-SOURCE_FILENAME=
+SOURCE_IN_SUBDIR=false
+SOURCE_EXTRACT=true
 EOT
 echo "... conf/$src.src updated"
 
diff --git a/conf/arm64.src b/conf/arm64.src
index dede895..fc1f190 100755
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -3,5 +3,4 @@ SOURCE_SUM=eb818e594f39dfff003d6ec406569f17c5a96aecdcd0fdc955a82342e576e5d4
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true
diff --git a/conf/arm7.src b/conf/arm7.src
index d4008a4..2a86d53 100755
--- a/conf/arm7.src
+++ b/conf/arm7.src
@@ -3,5 +3,4 @@ SOURCE_SUM=9b5438e954199813055022e50fb3f3765732e70aa27e85c3fe15110f39b470eb
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true
diff --git a/conf/x86-64.src b/conf/x86-64.src
index e57c3f9..4ab34bd 100755
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -3,5 +3,4 @@ SOURCE_SUM=e40fea62624bd76b2ea14abab10ace1f19a671795f2b0b161244ecd1f6f4c149
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=zip
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=
 SOURCE_EXTRACT=true