From 8a95e02d218572794e72276cea6c315fe9d0fbe3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 8 Sep 2021 20:01:53 +0200
Subject: [PATCH 01/12] slack

---
 fragments/labels/slack.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fragments/labels/slack.sh b/fragments/labels/slack.sh
index 4a73dba..18e7350 100644
--- a/fragments/labels/slack.sh
+++ b/fragments/labels/slack.sh
@@ -2,6 +2,6 @@ slack)
     name="Slack"
     type="dmg"
     downloadURL="https://slack.com/ssb/download-osx-universal" # Universal
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n' | sed -E 's/.*macos\/([0-9.]*)\/.*/\1/g' )
+    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | cut -d "/" -f6 )
     expectedTeamID="BQR82RBBHL"
     ;;

From 012b4db5f66ccafa50d181fde93e900beb1262be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 9 Sep 2021 17:00:31 +0200
Subject: [PATCH 02/12] Update microsoftofficebusinesspro.sh

---
 fragments/labels/microsoftofficebusinesspro.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fragments/labels/microsoftofficebusinesspro.sh b/fragments/labels/microsoftofficebusinesspro.sh
index f0c2199..48454f8 100644
--- a/fragments/labels/microsoftofficebusinesspro.sh
+++ b/fragments/labels/microsoftofficebusinesspro.sh
@@ -2,6 +2,7 @@ microsoftofficebusinesspro)
     name="MicrosoftOfficeBusinessPro"
     type="pkg"
     downloadURL="https://go.microsoft.com/fwlink/?linkid=2009112"
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3)
     expectedTeamID="UBF8T346G9"
     # using MS PowerPoint as the 'stand-in' for the entire suite
     appName="Microsoft PowerPoint.app"

From 8fdfaadf6d58099daca6cf9c64f1a557712b7c39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 9 Sep 2021 19:15:51 +0200
Subject: [PATCH 03/12] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1dfcca..d00c624 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,8 +2,8 @@
 
 - script is now assembled from fragments. This helps avoid merging conflicts on git and allows the core team to work on the script logic while also accepting new labels. See the "Assemble Script ReadMe" for details.
 - Change in finding installed apps. We now look in /Applications and /Applications/Utilities first. If not found there, we use spotligt to find it. (We discovered a problem when a user has Parallels Windows installed with Microsoft Edge in it. Then Installomator wanted to update the app all the time, becaus spotligt found that Windows version of the app that Parallels created.)
-- Added bunch of new labels
-- Renamed `buildCaseStatement.sh` to `buildLabel.sh` and improved it a lot. It is a great start when figuring out how to create a new label for an app, or a piece of software.
+- Added bunch of new labels, and improved others.
+- Renamed `buildCaseStatement.sh` to `buildLabel.sh` and improved it a lot. It is a great start when figuring out how to create a new label for an app, or a piece of software. Look at the tutorials in our wiki.
 - Mosyle changed their app name from Business to Self-Service
 
 ## v0.6 - 2021-07-14

From d603a2805b9cecf4a65dfc82640f332dcf6ce1ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 9 Sep 2021 21:25:33 +0200
Subject: [PATCH 04/12] Create parallels.sh

---
 fragments/disabled/parallels.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fragments/disabled/parallels.sh

diff --git a/fragments/disabled/parallels.sh b/fragments/disabled/parallels.sh
new file mode 100644
index 0000000..9d7dd46
--- /dev/null
+++ b/fragments/disabled/parallels.sh
@@ -0,0 +1,8 @@
+parallels)
+    # This downloads an installer app, so not really useful here
+    name="Parallels Desktop"
+    type="dmg"
+    downloadURL="https://parallels.com/directdownload/pd15/"
+    appNewVersion=$(curl -fsIL "${downloadURL}" | grep -i ^location | tail -1 | cut -d "/" -f6)
+    expectedTeamID="4C6364ACXT"
+    ;;

From a74d3106c0c68e7a790e63e0f329974f47387a17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 10 Sep 2021 23:05:50 +0200
Subject: [PATCH 05/12] authydesktop

---
 Labels.txt                       | 1 +
 fragments/labels/authydesktop.sh | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 100644 fragments/labels/authydesktop.sh

diff --git a/Labels.txt b/Labels.txt
index e5bc79d..25743fc 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -30,6 +30,7 @@ asana
 atext
 atom
 audacity
+authydesktop
 autodmg
 autopkgr
 aviatrix
diff --git a/fragments/labels/authydesktop.sh b/fragments/labels/authydesktop.sh
new file mode 100644
index 0000000..9051669
--- /dev/null
+++ b/fragments/labels/authydesktop.sh
@@ -0,0 +1,7 @@
+authydesktop)
+    name="Authy Desktop"
+    type="dmg"
+    downloadURL="https://electron.authy.com/download?channel=stable&arch=x64&platform=darwin&version=latest&product=authy"
+    appNewVersion="$(curl -sfL --output /dev/null -r 0-0 "${downloadURL}" --remote-header-name --remote-name -w "%{url_effective}\n" | grep -o -E '([a-zA-Z0-9\_.%-]*)\.(dmg|pkg|zip|tbz)$' | sed -E 's/.*-([0-9.]*)\.dmg/\1/g')"
+    expectedTeamID="9EVH78F4V4"
+    ;;

From 49c7338e9d5db3ac5caecdb8bb285136bcf79f39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 15 Sep 2021 16:16:50 +0200
Subject: [PATCH 06/12] figma universal

---
 fragments/labels/figma.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fragments/labels/figma.sh b/fragments/labels/figma.sh
index 5ebaaf6..40012c4 100644
--- a/fragments/labels/figma.sh
+++ b/fragments/labels/figma.sh
@@ -1,6 +1,6 @@
 figma)
     name="Figma"
     type="zip"
-    downloadURL="https://desktop.figma.com/mac/Figma.zip"
+    downloadURL="https://www.figma.com/download/desktop/mac"
     expectedTeamID="T8RA8NE3B7"
     ;;

From 1e971cc063f6dee398425db1b4788e98f6777cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 15 Sep 2021 16:27:02 +0200
Subject: [PATCH 07/12] Update buildLabel.sh

---
 utils/buildLabel.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/buildLabel.sh b/utils/buildLabel.sh
index 0e4f2c8..cd03fac 100755
--- a/utils/buildLabel.sh
+++ b/utils/buildLabel.sh
@@ -11,7 +11,7 @@ downloadURL=${1?:"need to provide a download URL."}
 # ./buildLabel.sh <URL to download software>
 
 # Use working directory as download folder
-tmpDir=$(date "+%Y-%m-%d-%H-%M-%S")
+tmpDir="$(pwd)/$(date "+%Y-%m-%d-%H-%M-%S")"
 # Create a n almost unique folder name
 mkdir $tmpDir
 

From 82a1ed8180e7da3fb6bba408baa3a856eb350833 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Wed, 15 Sep 2021 16:31:16 +0200
Subject: [PATCH 08/12] figma intel & arm

---
 fragments/labels/figma.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/fragments/labels/figma.sh b/fragments/labels/figma.sh
index 40012c4..ff49a05 100644
--- a/fragments/labels/figma.sh
+++ b/fragments/labels/figma.sh
@@ -1,6 +1,10 @@
 figma)
     name="Figma"
     type="zip"
-    downloadURL="https://www.figma.com/download/desktop/mac"
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL="https://desktop.figma.com/mac-arm/Figma.zip"
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL="https://desktop.figma.com/mac/Figma.zip"
+    fi
     expectedTeamID="T8RA8NE3B7"
     ;;

From fcbe0626dac3708375dedfc2caaa2cd5d0ef683d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 17 Sep 2021 12:31:48 +0200
Subject: [PATCH 09/12] montereyblocker

---
 fragments/labels/montereyblocker.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fragments/labels/montereyblocker.sh

diff --git a/fragments/labels/montereyblocker.sh b/fragments/labels/montereyblocker.sh
new file mode 100644
index 0000000..4429d42
--- /dev/null
+++ b/fragments/labels/montereyblocker.sh
@@ -0,0 +1,8 @@
+montereyblocker)
+    name="montereyblocker"
+    type="pkg"
+    packageID="dk.envo-it.montereyblocker"
+    downloadURL=$(downloadURLFromGit Theile montereyblocker )
+    appNewVersion=$(versionFromGit Theile montereyblocker )
+    expectedTeamID="FXW6QXBFW5"
+    ;;

From 9a57ecc66bfe8fa234ee5299566c34172998b02d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 17 Sep 2021 15:33:07 +0200
Subject: [PATCH 10/12] rodeconnect

---
 Labels.txt                      | 1 +
 fragments/labels/rodeconnect.sh | 8 ++++++++
 2 files changed, 9 insertions(+)
 create mode 100644 fragments/labels/rodeconnect.sh

diff --git a/Labels.txt b/Labels.txt
index 25743fc..2ecf9e2 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -238,6 +238,7 @@ ringcentralmeetings
 ringcentralphone
 rocket
 rocketchat
+rodeconnect
 royaltsx
 rstudio
 santa
diff --git a/fragments/labels/rodeconnect.sh b/fragments/labels/rodeconnect.sh
new file mode 100644
index 0000000..53fcf16
--- /dev/null
+++ b/fragments/labels/rodeconnect.sh
@@ -0,0 +1,8 @@
+rodeconnect)
+    name="RODE Connect"
+    type="pkgInZip"
+    packageID="com.rodeconnect.installer"
+    downloadURL="https://cdn1.rode.com/rodeconnect_installer_mac.zip"
+    appNewVersion="$(curl -fs https://rode.com/software/rode-connect | grep -i -o ">Current version .*<" | cut -d " " -f4)"
+    expectedTeamID="Z9T72PWTJA"
+    ;;

From 65b82cf20d9aadb846360da37c8b119efedcee2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 17 Sep 2021 15:35:31 +0200
Subject: [PATCH 11/12] rodeconnect

---
 fragments/labels/rodeconnect.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fragments/labels/rodeconnect.sh b/fragments/labels/rodeconnect.sh
index 53fcf16..42c904f 100644
--- a/fragments/labels/rodeconnect.sh
+++ b/fragments/labels/rodeconnect.sh
@@ -1,7 +1,7 @@
 rodeconnect)
     name="RODE Connect"
     type="pkgInZip"
-    packageID="com.rodeconnect.installer"
+    #packageID="com.rodeconnect.installer" #Versioned wrong as 0 in 1.1.0 pkg
     downloadURL="https://cdn1.rode.com/rodeconnect_installer_mac.zip"
     appNewVersion="$(curl -fs https://rode.com/software/rode-connect | grep -i -o ">Current version .*<" | cut -d " " -f4)"
     expectedTeamID="Z9T72PWTJA"

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 12/12] 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"