From 5799c5d4323d349fe7ba7b3b4e39a98dfa3da8f6 Mon Sep 17 00:00:00 2001 From: Jake Date: Wed, 6 Oct 2021 11:48:51 -0400 Subject: [PATCH 1/7] create perimeter81.sh --- fragments/labels/perimeter81.sh | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 fragments/labels/perimeter81.sh diff --git a/fragments/labels/perimeter81.sh b/fragments/labels/perimeter81.sh new file mode 100644 index 0000000..44690e2 --- /dev/null +++ b/fragments/labels/perimeter81.sh @@ -0,0 +1,7 @@ +perimeter81) + name="Perimeter81" + type="pkg" + downloadURL="https://static.perimeter81.com/agents/mac/snapshot/latest/Perimeter81.pkg" + appNewVersion="curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //'" + expectedTeamID="924635PD62" + ;; From 8e9488c68fa8b9c986bc479659d475669f22763a Mon Sep 17 00:00:00 2001 From: Jake Date: Wed, 6 Oct 2021 15:26:32 -0400 Subject: [PATCH 2/7] update appNewVersion for Perimeter81 --- fragments/labels/perimeter81.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/perimeter81.sh b/fragments/labels/perimeter81.sh index 44690e2..03473b0 100644 --- a/fragments/labels/perimeter81.sh +++ b/fragments/labels/perimeter81.sh @@ -2,6 +2,6 @@ perimeter81) name="Perimeter81" type="pkg" downloadURL="https://static.perimeter81.com/agents/mac/snapshot/latest/Perimeter81.pkg" - appNewVersion="curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //'" + appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //')" expectedTeamID="924635PD62" ;; From 9edc256caa6410f82c1cf37a51fb5e1a9983206c Mon Sep 17 00:00:00 2001 From: Jake Date: Wed, 6 Oct 2021 15:59:06 -0400 Subject: [PATCH 3/7] fix typo in name --- fragments/labels/perimeter81.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/perimeter81.sh b/fragments/labels/perimeter81.sh index 03473b0..f83dc93 100644 --- a/fragments/labels/perimeter81.sh +++ b/fragments/labels/perimeter81.sh @@ -1,5 +1,5 @@ perimeter81) - name="Perimeter81" + name="Perimeter 81" type="pkg" downloadURL="https://static.perimeter81.com/agents/mac/snapshot/latest/Perimeter81.pkg" appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //')" From b0ed6432f6db8fa5c4aedcbfa0681ed337a5e4ca Mon Sep 17 00:00:00 2001 From: Jake Date: Thu, 7 Oct 2021 10:55:00 -0400 Subject: [PATCH 4/7] fix version compare --- fragments/labels/perimeter81.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/perimeter81.sh b/fragments/labels/perimeter81.sh index f83dc93..353b0fb 100644 --- a/fragments/labels/perimeter81.sh +++ b/fragments/labels/perimeter81.sh @@ -2,6 +2,6 @@ perimeter81) name="Perimeter 81" type="pkg" downloadURL="https://static.perimeter81.com/agents/mac/snapshot/latest/Perimeter81.pkg" - appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //')" + appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //' | cut -d"." -f1-3))" expectedTeamID="924635PD62" ;; From 97ec3efedb4ef2082301b4423133ddb948c60539 Mon Sep 17 00:00:00 2001 From: Jake Date: Thu, 7 Oct 2021 11:18:13 -0400 Subject: [PATCH 5/7] update download url The download url was displaying all mirrors, this will pull just the first one. --- fragments/labels/blender.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/blender.sh b/fragments/labels/blender.sh index 3a822ef..a2372c6 100644 --- a/fragments/labels/blender.sh +++ b/fragments/labels/blender.sh @@ -1,7 +1,7 @@ blender) name="blender" type="dmg" - downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) + downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg | head -n 1) appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' ) expectedTeamID="68UA947AUU" ;; From f16ee55ed6114c1c55317e74fc97d93860230e1b Mon Sep 17 00:00:00 2001 From: Jake Date: Thu, 7 Oct 2021 13:20:34 -0400 Subject: [PATCH 6/7] Revert "update download url" This reverts commit 97ec3efedb4ef2082301b4423133ddb948c60539. --- fragments/labels/blender.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/blender.sh b/fragments/labels/blender.sh index a2372c6..3a822ef 100644 --- a/fragments/labels/blender.sh +++ b/fragments/labels/blender.sh @@ -1,7 +1,7 @@ blender) name="blender" type="dmg" - downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg | head -n 1) + downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' ) expectedTeamID="68UA947AUU" ;; From b6092df909905d892e8b7581d4aa8090e6331a7f Mon Sep 17 00:00:00 2001 From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com> Date: Thu, 14 Oct 2021 15:08:54 +0200 Subject: [PATCH 7/7] removed a spurious ) in perimeter81 --- fragments/labels/perimeter81.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fragments/labels/perimeter81.sh b/fragments/labels/perimeter81.sh index 353b0fb..2f05459 100644 --- a/fragments/labels/perimeter81.sh +++ b/fragments/labels/perimeter81.sh @@ -2,6 +2,6 @@ perimeter81) name="Perimeter 81" type="pkg" downloadURL="https://static.perimeter81.com/agents/mac/snapshot/latest/Perimeter81.pkg" - appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //' | cut -d"." -f1-3))" + appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //' | cut -d"." -f1-3)" expectedTeamID="924635PD62" ;;