From cfaac1eb28d680009533aaa335c34954909315c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= Date: Fri, 27 Aug 2021 11:17:41 +0200 Subject: [PATCH] more label syncs --- fragments/labels/jetbrainsdatagrip.sh | 21 ++++++++++----------- fragments/labels/jetbrainsintellijidea.sh | 5 ++--- fragments/labels/jetbrainsintellijideace.sh | 4 ++-- fragments/labels/jetbrainsphpstorm.sh | 9 ++++----- fragments/labels/jetbrainspycharm.sh | 11 +++++------ fragments/labels/jetbrainspycharmce.sh | 8 ++++---- fragments/labels/microsoftteams.sh | 6 ++---- 7 files changed, 29 insertions(+), 35 deletions(-) diff --git a/fragments/labels/jetbrainsdatagrip.sh b/fragments/labels/jetbrainsdatagrip.sh index eeae78d..87a77f3 100644 --- a/fragments/labels/jetbrainsdatagrip.sh +++ b/fragments/labels/jetbrainsdatagrip.sh @@ -1,12 +1,11 @@ jetbrainsdatagrip) - # credit: AP Orlebeke (@apizz) - name="DataGrip" - type="dmg" - appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3) - if [[ $(arch) == "arm64" ]]; then - downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'macM1*.*,' | cut -d '"' -f5) - elif [[ $(arch) == "i386" ]]; then - downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'mac*.*,' | cut -d '"' -f5) - fi - expectedTeamID="2ZEFAR8TH3" - ;; \ No newline at end of file + name="DataGrip" + type="dmg" + appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3) + if [[ $(arch) == "arm64" ]]; then + downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'macM1*.*,' | cut -d '"' -f5) + elif [[ $(arch) == "i386" ]]; then + downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=DG&latest=true&type=release" | grep -o 'mac*.*,' | cut -d '"' -f5) + fi + expectedTeamID="2ZEFAR8TH3" + ;; \ No newline at end of file diff --git a/fragments/labels/jetbrainsintellijidea.sh b/fragments/labels/jetbrainsintellijidea.sh index eeb92b2..233eda9 100644 --- a/fragments/labels/jetbrainsintellijidea.sh +++ b/fragments/labels/jetbrainsintellijidea.sh @@ -1,8 +1,7 @@ jetbrainsintellijidea) - # credit: Gabe Marchan (gabemarchan.com - @darklink87) name="IntelliJ IDEA" type="dmg" downloadURL="https://download.jetbrains.com/product?code=II&latest&distribution=mac" - appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=II&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3) + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' ) expectedTeamID="2ZEFAR8TH3" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/jetbrainsintellijideace.sh b/fragments/labels/jetbrainsintellijideace.sh index 6f0358c..7675050 100644 --- a/fragments/labels/jetbrainsintellijideace.sh +++ b/fragments/labels/jetbrainsintellijideace.sh @@ -3,6 +3,6 @@ intellijideace) name="IntelliJ IDEA CE" type="dmg" downloadURL="https://download.jetbrains.com/product?code=IIC&latest&distribution=mac" - appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=IIC&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3) + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' ) expectedTeamID="2ZEFAR8TH3" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/jetbrainsphpstorm.sh b/fragments/labels/jetbrainsphpstorm.sh index 5febd68..98e7773 100644 --- a/fragments/labels/jetbrainsphpstorm.sh +++ b/fragments/labels/jetbrainsphpstorm.sh @@ -1,8 +1,7 @@ jetbrainsphpstorm) - # credit: Casey Jensen (@cajenson01 on MacAdmins Slack)Appended by Skylar Damiano @catdad on MacAdmins Slack - name="JetBrains PHPStorm" + name="PHPStorm" type="dmg" - downloadURL=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=PS&latest=true&type=release" | grep -o "mac*.*.dmg" | cut -d '"' -f5) - appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=PS&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3) + downloadURL="https://download.jetbrains.com/product?code=PS&latest&distribution=mac" + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' ) expectedTeamID="2ZEFAR8TH3" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/jetbrainspycharm.sh b/fragments/labels/jetbrainspycharm.sh index 74f2e7d..18670a1 100644 --- a/fragments/labels/jetbrainspycharm.sh +++ b/fragments/labels/jetbrainspycharm.sh @@ -1,13 +1,12 @@ jetbrainspycharm) - # This is the Pro version of PyCharm. - # Do not confuse with PyCharm CE. + # This is the Pro version of PyCharm. Do not confuse with PyCharm CE. name="PyCharm" type="dmg" - appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=PCP&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3) if [[ $(arch) == i386 ]]; then - downloadURL="https://download.jetbrains.com/product?code=PCP&latest&distribution=mac" + downloadURL="https://download.jetbrains.com/product?code=PCP&latest&distribution=mac" elif [[ $(arch) == arm64 ]]; then - downloadURL="https://download.jetbrains.com/product?code=PCP&latest&distribution=macM1" + downloadURL="https://download.jetbrains.com/product?code=PCP&latest&distribution=macM1" fi + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' ) expectedTeamID="2ZEFAR8TH3" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/jetbrainspycharmce.sh b/fragments/labels/jetbrainspycharmce.sh index c135c82..8d738a1 100644 --- a/fragments/labels/jetbrainspycharmce.sh +++ b/fragments/labels/jetbrainspycharmce.sh @@ -2,11 +2,11 @@ jetbrainspycharmce|\ pycharmce) name="PyCharm CE" type="dmg" - appNewVersion=$(curl -fs "https://data.services.jetbrains.com/products/releases?code=PCC&latest=true&type=release" | grep -o 'version*.*,' | cut -d '"' -f3) if [[ $(arch) == i386 ]]; then - downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=mac" + downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=mac" elif [[ $(arch) == arm64 ]]; then - downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=macM1" + downloadURL="https://download.jetbrains.com/product?code=PCC&latest&distribution=macM1" fi + appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "location" | tail -1 | sed -E 's/.*\/[a-zA-Z-]*-([0-9.]*).*[-.].*dmg/\1/g' ) expectedTeamID="2ZEFAR8TH3" - ;; + ;; \ No newline at end of file diff --git a/fragments/labels/microsoftteams.sh b/fragments/labels/microsoftteams.sh index 9b18409..b580758 100644 --- a/fragments/labels/microsoftteams.sh +++ b/fragments/labels/microsoftteams.sh @@ -3,13 +3,11 @@ microsoftteams) type="pkg" packageID="com.microsoft.teams" downloadURL="https://go.microsoft.com/fwlink/?linkid=869428" - #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.teams.standalone"]/version' 2>/dev/null | sed -E 's/([0-9.]*) .*/\1/') - # Still using macadmin.software for version, as the path does not contain the version in a matching format. packageID can be used, but version is the same. appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.teams.standalone"]/version' 2>/dev/null | sed -E 's/([0-9.]*) .*/\1/') - # Looks like macadmin.software has package ID version. At least on 2021-05-28 version 1.00.411161 is matched on installed version and homepage. + # Looks like macadmin.software has package ID version. At least on 202105-28 version 1.00.411161 is matched on installed version and homepage. expectedTeamID="UBF8T346G9" blockingProcesses=( Teams "Microsoft Teams Helper" ) # Commenting out msupdate as it is not really supported *yet* for teams # updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate" # updateToolArguments=( --install --apps TEAM01 ) - ;; + ;; \ No newline at end of file