From eb501486e45c4b9d8dcf99b578756e0eb8ddd415 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 17 Sep 2021 20:02:21 +0200
Subject: [PATCH] Update buildLabel.sh

---
 utils/buildLabel.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/utils/buildLabel.sh b/utils/buildLabel.sh
index cd03fac..e64f81e 100755
--- a/utils/buildLabel.sh
+++ b/utils/buildLabel.sh
@@ -65,25 +65,26 @@ appInvestigation() {
     fi
 }
 
-echo "downloadOut:\n${downloadOut}"
+#echo "downloadOut:\n${downloadOut}"
 archiveTempName=$( echo "${downloadOut}" | head -1 )
 echo "archiveTempName: $archiveTempName"
 archivePath=$( echo "${downloadOut}" | tail -1 )
 echo "archivePath: $archivePath"
 
-try1archiveName=${archiveTempName##*/}
-try2archiveName=${archivePath##*/}
-fileName_re='^([a-zA-Z0-9\_.-]*)\.(dmg|pkg|zip|tbz)$'
+try1archiveName=${${archiveTempName##*/}%%\?*}
+try2archiveName=${${archivePath##*/}%%\?*}
+fileName_re='^([a-zA-Z0-9\_.%-]*)\.(dmg|pkg|zip|tbz)$'
 if [[ "${try1archiveName}" =~ $fileName_re ]]; then
     archiveName=${try1archiveName}
 elif [[ "${try2archiveName}" =~ $fileName_re ]]; then
     archiveName=${try2archiveName}
 else
     echo "Could not determine archiveName from “$try1archiveName” and “$try2archiveName”"
+    #echo "Extensions $archiveTempName:t:e $archivePath:t:e"
     exit
 fi
 
-echo "archiveName: $archiveName"
+echo "Calculated archiveName: $archiveName"
 mv $archiveTempName $archiveName
 name=${archiveName%.*}
 echo "name: $name"