From 916da6283e1f7227e5bffb192906b24a1c9d1863 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <st@ENVO-st.local>
Date: Tue, 23 Aug 2022 15:10:55 +0200
Subject: [PATCH] Change mathing on `archiveName` for GitHub.

---
 fragments/functions.sh | 2 +-
 utils/checkLabels.sh   | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fragments/functions.sh b/fragments/functions.sh
index 63e7049..3ecf8b0 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -160,7 +160,7 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
 
     if [ -n "$archiveName" ]; then
         #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }")
-        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*$archiveName.*" | tail -1)
+        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*$archiveName" | tail -1)
     else
         #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
         downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*\.$filetype" | tail -1)
diff --git a/utils/checkLabels.sh b/utils/checkLabels.sh
index 19b2e41..0cbccb6 100755
--- a/utils/checkLabels.sh
+++ b/utils/checkLabels.sh
@@ -56,11 +56,9 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
     #echo "$githubPart"
     #downloadURL="https://github.com/$gitusername/$gitreponame/releases/latest"
     if [ -n "$archiveName" ]; then
-        #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }")
-        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*$archiveName.*" | tail -1)
+        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*$archiveName" | tail -1)
     else
-        #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
-        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*\.$filetype" | tail -1)
+        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*\.$type" | tail -1)
     fi
     echo "$downloadURL"
     return 0
@@ -249,6 +247,9 @@ for fixedArch in i386 arm64; do
                         fi
                     else
                         githubPart="$(echo "$downloadURL" | cut -d "/" -f4-6)"
+                        echo "type: $type"
+                        echo "archiveName: $archiveName"
+                        echo "githubPart: $githubPart"
                         if [[ "$(curl -fsL "$downloadURL" | grep -io "${githubPart}.*\.${expectedExtension}")" != "" ]]; then
                             echo "${GREEN}OK: download extension MATCH on ${expectedExtension}${NC}"
                         else