From c37daf5b7ba8bb5c83340d605771d55484e0e972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 21 Sep 2021 11:52:18 +0200 Subject: [PATCH 1/4] azurestorageexplorer --- Labels.txt | 1 + fragments/labels/azurestorageexplorer.sh | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 fragments/labels/azurestorageexplorer.sh diff --git a/Labels.txt b/Labels.txt index 603a793..282a4f1 100644 --- a/Labels.txt +++ b/Labels.txt @@ -36,6 +36,7 @@ autopkgr aviatrix awscli2 awsvpnclient +azurestorageexplorer balenaetcher balsamiqwireframes bartender diff --git a/fragments/labels/azurestorageexplorer.sh b/fragments/labels/azurestorageexplorer.sh new file mode 100644 index 0000000..dad6b99 --- /dev/null +++ b/fragments/labels/azurestorageexplorer.sh @@ -0,0 +1,8 @@ +azurestorageexplorer) + name="Microsoft Azure Storage Explorer" + type="zip" + downloadURL=$(downloadURLFromGit microsoft AzureStorageExplorer ) + appNewVersion=$(versionFromGit microsoft AzureStorageExplorer ) + expectedTeamID="UBF8T346G9" + archiveName="Mac_StorageExplorer.zip" + ;; From 50bc2fd708c5674f1828420e4bd8e7d039bee5af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Tue, 21 Sep 2021 13:29:20 +0200 Subject: [PATCH 2/4] microsoftazurestorageexplorer --- Labels.txt | 2 +- ...azurestorageexplorer.sh => microsoftazurestorageexplorer.sh} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename fragments/labels/{azurestorageexplorer.sh => microsoftazurestorageexplorer.sh} (89%) diff --git a/Labels.txt b/Labels.txt index 282a4f1..5f05d0c 100644 --- a/Labels.txt +++ b/Labels.txt @@ -36,7 +36,6 @@ autopkgr aviatrix awscli2 awsvpnclient -azurestorageexplorer balenaetcher balsamiqwireframes bartender @@ -167,6 +166,7 @@ malwarebytes mattermost menumeters microsoftautoupdate +microsoftazurestorageexplorer microsoftcompanyportal microsoftdefenderatp microsoftedge diff --git a/fragments/labels/azurestorageexplorer.sh b/fragments/labels/microsoftazurestorageexplorer.sh similarity index 89% rename from fragments/labels/azurestorageexplorer.sh rename to fragments/labels/microsoftazurestorageexplorer.sh index dad6b99..3d83524 100644 --- a/fragments/labels/azurestorageexplorer.sh +++ b/fragments/labels/microsoftazurestorageexplorer.sh @@ -1,4 +1,4 @@ -azurestorageexplorer) +microsoftazurestorageexplorer) name="Microsoft Azure Storage Explorer" type="zip" downloadURL=$(downloadURLFromGit microsoft AzureStorageExplorer ) From effd470ce7a1184d690279c1d9fbb213c64e374b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Mon, 27 Sep 2021 11:38:11 +0200 Subject: [PATCH 3/4] screamingfrogseospider Fixed downloadURL, added appNewVersion --- fragments/labels/googlechrome.sh | 4 ++-- fragments/labels/screamingfrogseospider.sh | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fragments/labels/googlechrome.sh b/fragments/labels/googlechrome.sh index cd582d4..6fc35b1 100644 --- a/fragments/labels/googlechrome.sh +++ b/fragments/labels/googlechrome.sh @@ -4,11 +4,11 @@ googlechrome) if [[ $(arch) != "i386" ]]; then printlog "Architecture: arm64 (not i386)" downloadURL="https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg" - appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}') # Credit: William Smith (@meck) + appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}') else printlog "Architecture: i386" downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg" - appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac,stable/{print $3; exit}') # Credit: William Smith (@meck) + appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac,stable/{print $3; exit}') fi expectedTeamID="EQHXZ8M8AV" ;; diff --git a/fragments/labels/screamingfrogseospider.sh b/fragments/labels/screamingfrogseospider.sh index fa44f00..1a2aaf6 100644 --- a/fragments/labels/screamingfrogseospider.sh +++ b/fragments/labels/screamingfrogseospider.sh @@ -1,6 +1,7 @@ screamingfrogseospider) name="Screaming Frog SEO Spider" type="dmg" - downloadURL="https://download.screamingfrog.co.uk/products/seo-spider/ScreamingFrogSEOSpider-14.3.dmg" + downloadURL=$(curl -fs "https://www.screamingfrog.co.uk/wp-content/themes/screamingfrog/inc/download-modal.php" | grep -i -o "https.*\.dmg" | head -1) + appNewVersion=$(print "$downloadURL" | sed -E 's/https.*\/[a-zA-Z]*-([0-9.]*)\.dmg/\1/g')".0" expectedTeamID="CAHEVC3HZC" ;; From d97c84dd0c706076da3a59fc20c89050bcf0a6ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Thu, 30 Sep 2021 08:55:52 +0200 Subject: [PATCH 4/4] calibre and vmwarehorizonclient --- fragments/labels/calibre.sh | 4 ++++ fragments/labels/vmwarehorizonclient.sh | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/fragments/labels/calibre.sh b/fragments/labels/calibre.sh index fef2fb1..138605b 100644 --- a/fragments/labels/calibre.sh +++ b/fragments/labels/calibre.sh @@ -4,5 +4,9 @@ calibre) type="dmg" downloadURL="https://calibre-ebook.com/dist/osx" appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' ) + #Maybe change to GitHub for this title. Looks like 5.28.0 release is the first to also release a binary, so maybe see what the next release will be to decide if we should switch. + #downloadURL=$(downloadURLFromGit kovidgoyal calibre ) + #appNewVersion=$(versionFromGit kovidgoyal calibre ) + #archiveName="OS X dmg" expectedTeamID="NTY7FVCEKP" ;; diff --git a/fragments/labels/vmwarehorizonclient.sh b/fragments/labels/vmwarehorizonclient.sh index 7d1288f..428af60 100644 --- a/fragments/labels/vmwarehorizonclient.sh +++ b/fragments/labels/vmwarehorizonclient.sh @@ -1,8 +1,7 @@ vmwarehorizonclient) - # credit: Oh4sh0 https://github.com/Oh4sh0 name="VMware Horizon Client" type="dmg" - downloadURL=$(curl -fs "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | grep -o 'Url.*..dmg"' | cut -d '"' -f3) - appNewVersion=$(curl -fs "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | sed 's/.*-\(.*\)-.*/\1/') + downloadURL=$(curl -fsL "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | grep -o 'Url.*..dmg"' | cut -d '"' -f3) + appNewVersion=$(curl -fsL "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | sed 's/.*-\(.*\)-.*/\1/') expectedTeamID="EG7KH642X6" ;;