From 378b16616498bb026b0ba8240d7c11b71f36c2e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Fri, 4 Feb 2022 10:55:14 +0100
Subject: [PATCH] Labels fixed

---
 fragments/labels/logitechoptions.sh | 5 +++--
 fragments/labels/mattermost.sh      | 4 ++--
 fragments/labels/tom4aconverter.sh  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/fragments/labels/logitechoptions.sh b/fragments/labels/logitechoptions.sh
index c3cf225..125362e 100644
--- a/fragments/labels/logitechoptions.sh
+++ b/fragments/labels/logitechoptions.sh
@@ -1,8 +1,9 @@
 logitechoptions)
     name="Logitech Options"
     type="pkgInZip"
-    downloadURL=$(curl -fs https://support.logi.com/api/v2/help_center/en-us/articles.json | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip")
-    appNewVersion=$(curl -fs https://support.logi.com/api/v2/help_center/en-us/articles.json | tr "," "\n" | grep -A 10 "macOS" | grep -B 5 -ie "https.*/.*/options/.*\.zip" | grep "Software Version" | sed 's/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]//g' | grep -ioe "Software Version.*[0-9.]*" | tr "/" "\n" | grep -oe "[0-9.]*" | head -1)
+    #downloadURL=$(curl -fs https://support.logi.com/api/v2/help_center/en-us/articles.json | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip")
+    downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip"
+    #appNewVersion=$(curl -fs https://support.logi.com/api/v2/help_center/en-us/articles.json | tr "," "\n" | grep -A 10 "macOS" | grep -B 5 -ie "https.*/.*/options/.*\.zip" | grep "Software Version" | sed 's/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]//g' | grep -ioe "Software Version.*[0-9.]*" | tr "/" "\n" | grep -oe "[0-9.]*" | head -1)
     #pkgName="LogiMgr Installer "*".app/Contents/Resources/LogiMgr.pkg"
     pkgName=LogiMgr.pkg
     expectedTeamID="QED4VVPZWA"
diff --git a/fragments/labels/mattermost.sh b/fragments/labels/mattermost.sh
index 532a436..eab4c0a 100644
--- a/fragments/labels/mattermost.sh
+++ b/fragments/labels/mattermost.sh
@@ -3,7 +3,7 @@ mattermost)
     type="dmg"
     archiveName="mac-universal.dmg"
     downloadURL=$(downloadURLFromGit mattermost desktop)
-    appNewVersion=$(versionFromGit mattermost desktop )
+    appNewVersion=$(versionFromGit mattermost desktop)
     expectedTeamID="UQ8HT4Q2XM"
-    Mattermost Helper (Renderer).app app.asar
+    blockingProcesses=( "Mattermost Helper.app" "Mattermost Helper (Renderer).app" "Mattermost Helper (GPU).app" "Mattermost Helper (Plugin).app" )
     ;;
diff --git a/fragments/labels/tom4aconverter.sh b/fragments/labels/tom4aconverter.sh
index bfc2b77..72dafa4 100644
--- a/fragments/labels/tom4aconverter.sh
+++ b/fragments/labels/tom4aconverter.sh
@@ -2,6 +2,6 @@ tom4aconverter)
      name="To M4A Converter"
      type="dmg"
      downloadURL="https://amvidia.com/downloads/to-m4a-converter-mac.dmg"
-     appNewVersion=curl -sf "https://amvidia.com/to-m4a-converter" | grep -o -E '"softwareVersion":.'"{8}" | sed 's/\"//g' | awk -F ': ' '{print $2}'
+     appNewVersion=$(curl -sf "https://amvidia.com/to-m4a-converter" | grep -o -E '"softwareVersion":.'"{8}" | sed 's/\"//g' | awk -F ': ' '{print $2}')
      expectedTeamID="F2TH9XX9CJ"
      ;;