From 195b7df5f5f7fb7d9b3609d9a79e4924c06bef0f Mon Sep 17 00:00:00 2001
From: fleish <2106430+fleish@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:07:19 -0800
Subject: [PATCH 1/5] GPG Suite blocking process update

Looks for GPG Keychain as there is no GPG Suite.app
---
 fragments/labels/gpgsuite.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fragments/labels/gpgsuite.sh b/fragments/labels/gpgsuite.sh
index 60a8953..d2066bb 100644
--- a/fragments/labels/gpgsuite.sh
+++ b/fragments/labels/gpgsuite.sh
@@ -5,4 +5,5 @@ gpgsuite)
     pkgName="Install.pkg"
     downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4)
     expectedTeamID="PKV8ZPD836"
+    blockingProcesses=( "GPG Keychain" )
     ;;

From ad4692e9bfb45fd1357040c3e440fbbd871aeed4 Mon Sep 17 00:00:00 2001
From: fleish <2106430+fleish@users.noreply.github.com>
Date: Wed, 19 Jan 2022 15:08:42 -0800
Subject: [PATCH 2/5] Create daisydisk.sh

DaisyDisk app from https://daisydiskapp.com/
---
 fragments/labels/daisydisk.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 fragments/labels/daisydisk.sh

diff --git a/fragments/labels/daisydisk.sh b/fragments/labels/daisydisk.sh
new file mode 100644
index 0000000..638e61f
--- /dev/null
+++ b/fragments/labels/daisydisk.sh
@@ -0,0 +1,7 @@
+daisydisk)
+    name="DaisyDisk"
+    type="zip"
+    downloadURL="https://daisydiskapp.com/downloads/DaisyDisk.zip"
+    appNewVersion=$( curl -fs 'https://daisydiskapp.com/downloads/appcastReleaseNotes.php?appEdition=Standard' | grep Version | head -1 | cut -d \> -f 3 | cut -d \< -f 1 | awk '{print $2}' )
+    expectedTeamID="4CBU3JHV97"
+    ;;

From 197e07ed9936cccfb4ecaf93738a0aa8d020913d Mon Sep 17 00:00:00 2001
From: pythoninthegrass <4097471+pythoninthegrass@users.noreply.github.com>
Date: Wed, 19 Jan 2022 17:48:21 -0600
Subject: [PATCH 3/5] Added Tableau Public to

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

diff --git a/fragments/labels/tableaupublic.sh b/fragments/labels/tableaupublic.sh
new file mode 100644
index 0000000..c4bf7fd
--- /dev/null
+++ b/fragments/labels/tableaupublic.sh
@@ -0,0 +1,8 @@
+tableaupublic)
+    name="Tableau Public"
+    type="pkgInDmg"
+    packageID="com.tableausoftware.tableaudesktop"
+    downloadURL=$(curl -fs https://www.tableau.com/downloads/public/mac | awk '/TableauPublic/' | xmllint --recover --html --xpath "//a/text()" -)
+    appNewVersion=$(/usr/bin/python -c "import re; url = '$downloadURL'; ver_regex = re.compile(r'([0-9]+(?:-[0-9]+)+)'); ver_regex.findall(url); dashes = ''.join(ver_regex.findall(url)); print(dashes.replace('-', '.'))")
+    expectedTeamID="QJ4XPRK37C"
+    ;;

From 449f7e5261a92a9a5bb9224aab64d8c48a60c9e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 20 Jan 2022 08:35:06 +0100
Subject: [PATCH 4/5] Update daisydisk.sh

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

diff --git a/fragments/labels/daisydisk.sh b/fragments/labels/daisydisk.sh
index 638e61f..189d187 100644
--- a/fragments/labels/daisydisk.sh
+++ b/fragments/labels/daisydisk.sh
@@ -2,6 +2,6 @@ daisydisk)
     name="DaisyDisk"
     type="zip"
     downloadURL="https://daisydiskapp.com/downloads/DaisyDisk.zip"
-    appNewVersion=$( curl -fs 'https://daisydiskapp.com/downloads/appcastReleaseNotes.php?appEdition=Standard' | grep Version | head -1 | cut -d \> -f 3 | cut -d \< -f 1 | awk '{print $2}' )
+    appNewVersion=$( curl -fs 'https://daisydiskapp.com/downloads/appcastReleaseNotes.php?appEdition=Standard' | grep Version | head -1 | sed -E 's/.*Version ([0-9.]*).*/\1/g' )
     expectedTeamID="4CBU3JHV97"
     ;;

From f2354ec755fdaa04b1ad08720fad38afb59ada65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 20 Jan 2022 09:03:08 +0100
Subject: [PATCH 5/5] Update tableaupublic.sh

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

diff --git a/fragments/labels/tableaupublic.sh b/fragments/labels/tableaupublic.sh
index c4bf7fd..16430d9 100644
--- a/fragments/labels/tableaupublic.sh
+++ b/fragments/labels/tableaupublic.sh
@@ -3,6 +3,6 @@ tableaupublic)
     type="pkgInDmg"
     packageID="com.tableausoftware.tableaudesktop"
     downloadURL=$(curl -fs https://www.tableau.com/downloads/public/mac | awk '/TableauPublic/' | xmllint --recover --html --xpath "//a/text()" -)
-    appNewVersion=$(/usr/bin/python -c "import re; url = '$downloadURL'; ver_regex = re.compile(r'([0-9]+(?:-[0-9]+)+)'); ver_regex.findall(url); dashes = ''.join(ver_regex.findall(url)); print(dashes.replace('-', '.'))")
+    appNewVersion=$( echo $downloadURL | sed -E 's/.*TableauPublic-([-0-9]*)\.dmg/\1/g' | tr "-" "." )
     expectedTeamID="QJ4XPRK37C"
     ;;