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 1/2] 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 f2354ec755fdaa04b1ad08720fad38afb59ada65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Thu, 20 Jan 2022 09:03:08 +0100 Subject: [PATCH 2/2] 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" ;;