updated fragements

2026-03-08 05:31:53 +00:00 · 2021-08-16 16:16:36 +02:00
parent dcba9f9eb7
commit 97e8c160d2
300 changed files with 87 additions and 2805 deletions
--- a/fragments/arguments.sh
+++ b/fragments/arguments.sh
@@ -1,4 +1,3 @@
-
 # MARK: check minimal macOS requirement
 autoload is-at-least

@@ -40,6 +39,10 @@ label=${label:l}
 printlog "################## Start Installomator v. $VERSION"
 printlog "################## $label"

+# How we get version number from app
+# (alternative is "CFBundleVersion", that can be used in labels)
+versionKey="CFBundleShortVersionString"
+
 # get current user
 currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }')

--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -134,7 +134,15 @@ xpath() {


 getAppVersion() {
-    # modified by: Søren Theilgaard (@theilgaard)
+    # modified by: Søren Theilgaard (@theilgaard) and Isaac Ordonez
+
+    # If label contain function appCustomVersion, we use that and return
+    if type 'appCustomVersion' 2>/dev/null | grep -q 'function'; then
+        appversion=$(appCustomVersion)
+        printlog "Custom App Version detection is used, found $appversion"
+        return
+    fi
+    
    # pkgs contains a version number, then we don't have to search for an app
    if [[ $packageID != "" ]]; then
        appversion="$(pkgutil --pkg-info-plist ${packageID} 2>/dev/null | grep -A 1 pkg-version | tail -1 | sed -E 's/.*>([0-9.]*)<.*/\1/g')"
@@ -146,15 +154,16 @@ getAppVersion() {
        fi
    fi
    
-    # get all apps matching name
-    applist=$(mdfind "kind:application $appName" -0 )
-    if [[ $applist = "" ]]; then
-        printlog "Spotlight not returning any app, trying manually in /Applications."
-        if [[ -d "/Applications/$appName" ]]; then
-            applist="/Applications/$appName"
-        fi
+    # get app in /Applications, or /Applications/Utilities, or find using Spotlight
+    if [[ -d "/Applications/$appName" ]]; then
+        applist="/Applications/$appName"
+    elif [[ -d "/Applications/Utilities/$appName" ]]; then
+        applist="/Applications/Utilities/$appName"
+    else
+        applist=$(mdfind "kind:application $appName" -0 )
    fi
-     
+    printlog "App(s) found: ${applist}"
+
    appPathArray=( ${(0)applist} )

    if [[ ${#appPathArray} -gt 0 ]]; then
@@ -162,7 +171,7 @@ getAppVersion() {
        if [[ ${#filteredAppPaths} -eq 1 ]]; then
            installedAppPath=$filteredAppPaths[1]
            #appversion=$(mdls -name kMDItemVersion -raw $installedAppPath )
-            appversion=$(defaults read $installedAppPath/Contents/Info.plist CFBundleShortVersionString) #Not dependant on Spotlight indexing
+            appversion=$(defaults read $installedAppPath/Contents/Info.plist $versionKey) #Not dependant on Spotlight indexing
            printlog "found app at $installedAppPath, version $appversion"
        else
            printlog "could not determine location of $appName"
@@ -188,6 +197,18 @@ checkRunningProcesses() {
                appClosed=1
                
                case $BLOCKING_PROCESS_ACTION in
+                    quit|quit_kill)
+                        printlog "telling app $x to quit"
+                        runAsUser osascript -e "tell app \"$x\" to quit"
+                        if [[ $i > 2 && $BLOCKING_PROCESS_ACTION = "quit_kill" ]]; then
+                          printlog "Changing BLOCKING_PROCESS_ACTION to kill"
+                          BLOCKING_PROCESS_ACTION=kill
+                        else
+                            # give the user a bit of time to quit apps
+                            printlog "waiting 30 seconds for processes to quit"
+                            sleep 30
+                        fi
+                        ;;
                    kill)
                      printlog "killing process $x"
                      pkill $x
@@ -310,7 +331,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir

    # versioncheck
    # credit: Søren Theilgaard (@theilgaard)
-    appNewVersion=$(defaults read $appPath/Contents/Info.plist CFBundleShortVersionString)
+    appNewVersion=$(defaults read $appPath/Contents/Info.plist $versionKey)
    if [[ $appversion == $appNewVersion ]]; then
        printlog "Downloaded version of $name is $appNewVersion, same as installed."
        if [[ $INSTALL != "force" ]]; then
@@ -584,4 +605,3 @@ finishing() {
        displaynotification "$message" "$name update/installation complete!"
    fi
 }
-
--- a/fragments/header.sh
+++ b/fragments/header.sh
@@ -3,12 +3,18 @@ label="" # if no label is sent to the script, this will be used

 # Installomator
 #
-# Downloads and installs an Applications
-# 2020 Armin Briegel - Scripting OS X
+# Downloads and installs Applications
+# 2020-2021 Installomator
 #
 # inspired by the download scripts from William Smith and Sander Schram
-# with additional ideas and contribution from Isaac Ordonez, Mann consulting
-# and help from Søren Theilgaard (theilgaard.dk)
+# 
+# Contributers:
+#    Armin Briegel - @scriptingosx
+#    Isaac Ordonez - @issacatmann
+#    Søren Theilgaard - @Theile
+#    Adam Codega - @acodega
+#
+# with contributions from many others

 export PATH=/usr/bin:/bin:/usr/sbin:/sbin

@@ -31,6 +37,9 @@ NOTIFY=success
 BLOCKING_PROCESS_ACTION=prompt_user
 # options:
 #   - ignore       continue even when blocking processes are found
+#   - quit         app will be told to quit nicely, if running
+#   - quit_kill    told to quit twice, then it will be killed
+#                  Could be great for service apps, if they do not respawn
 #   - silent_fail  exit script without prompt or installation
 #   - prompt_user  show a user dialog for each blocking process found
 #                  abort after three attempts to quit
@@ -58,6 +67,7 @@ LOGO=appstore
 #   - jamf          JAMF Pro
 #   - mosyleb       Mosyle Business
 #   - mosylem       Mosyle Manager (Education)
+#   - addigy        Addigy
 # path can also be set in the command call, and if file exists, it will be used, like 'LOGO="/System/Applications/App\ Store.app/Contents/Resources/AppIcon.icns"' (spaces are escaped).


@@ -111,6 +121,18 @@ REOPEN="yes"
 #   If given, it will be compared to installed version, to see if download is different.
 #   It does not check for newer or not, only different.
 #
+# - versionKey: (optional)
+#   How we get version number from app. Possible values:
+#     - CFBundleShortVersionString
+#     - CFBundleVersion
+#   Not all software titles uses fields the same. 
+#   See Opera label.
+#
+# - appCustomVersion(){}: (optional function)
+#   This function can be added to your label, if a specific custom
+#   mechanism hs to be used for getting the installed version.
+#   See labels zulujdk11, zulujdk13, zulujdk15
+#
 # - expectedTeamID: (required)
 #   10-digit developer team ID.
 #   Obtain the team ID by running:
@@ -163,4 +185,3 @@ REOPEN="yes"
 # - updateToolRunAsCurrentUser:
 #   When this variable is set (any value), $updateTool will be run as the current user.
 #
-
--- a/fragments/labels/1password7.txt
+++ b/fragments/labels/1password7.txt
@@ -1,10 +0,0 @@
-
-1password7)
-    name="1Password 7"
-    type="pkg"
-    downloadURL="https://app-updates.agilebits.com/download/OPM7"
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[0-9a-zA-Z]*-([0-9.]*)\..*/\1/g' )
-    expectedTeamID="2BUA8C4S2C"
-    blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" )
-    #forcefulQuit=YES
-    ;;
--- a/fragments/labels/4kvideodownloader.txt
+++ b/fragments/labels/4kvideodownloader.txt
@@ -1,9 +0,0 @@
-
-4kvideodownloader)
-    name="4K Video Downloader"
-    type="dmg"
-    downloadURL="$(curl -fsL "https://www.4kdownload.com/products/product-videodownloader" | grep -E -o "https:\/\/dl\.4kdownload\.com\/app\/4kvideodownloader_.*?.dmg\?source=website" | head -1)"
-    appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/[0-9a-zA-Z]*_([0-9.]*)\.dmg.*/\1/g')
-	versionKey="CFBundleVersion"
-    expectedTeamID="GHQ37VJF83"
-    ;;
--- a/fragments/labels/8x8.txt
+++ b/fragments/labels/8x8.txt
@@ -1,10 +0,0 @@
-
-8x8)
-    # credit: #D-A-James from MacAdmins Slack and Isaac Ordonez, Mann consulting (@mannconsulting)
-    name="8x8 Work"
-    type="dmg"
-    downloadURL=$(curl -fs -L https://support.8x8.com/cloud-phone-service/voice/work-desktop/download-8x8-work-for-desktop | grep -m 1 -o "https.*dmg" | sed 's/\"//' | awk '{print $1}')
-    # As for appNewVersion, it needs to be checked for newer version than 7.2.4
-    appNewVersion=$(curl -fs -L https://support.8x8.com/cloud-phone-service/voice/work-desktop/download-8x8-work-for-desktop | grep -m 1 -o "https.*dmg" | sed 's/\"//' | awk '{print $1}' | sed -E 's/.*-v([0-9\.]*)[-\.]*.*/\1/' )
-    expectedTeamID="FC967L3QRG"
-    ;;
--- a/fragments/labels/abstract.txt
+++ b/fragments/labels/abstract.txt
@@ -1,8 +0,0 @@
-
-abstract)
-    name="Abstract"
-    type="zip"
-    downloadURL="https://api.goabstract.com/releases/latest/download"
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
-    expectedTeamID="77MZLZE47D"
-    ;;
--- a/fragments/labels/adobebrackets.txt
+++ b/fragments/labels/adobebrackets.txt
@@ -1,8 +0,0 @@
-
-adobebrackets)
-    name="Brackets"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit adobe brackets )
-    appNewVersion=$(versionFromGit adobe brackets )
-    expectedTeamID="JQ525L2MZD"
-    ;;
--- a/fragments/labels/adobeconnect.txt
+++ b/fragments/labels/adobeconnect.txt
@@ -1,11 +0,0 @@
-
-adobeconnect)
-    # credit: Oh4sh0 https://github.com/Oh4sh0
-    # Comment by Søren: I do not know this software.
-    # Looks like it's an Adobe installer in an app, so it will probably not work
-    name="AdobeConnectInstaller"
-    type="dmg"
-    downloadURL="http://www.adobe.com/go/ConnectSetupMac"
-    appNewVersion=$(curl -fs https://helpx.adobe.com/adobe-connect/connect-downloads-updates.html | grep "Mac" | grep version | head -1 | sed -E 's/.*\(version ([0-9\.]*),.*/\1/g')
-    expectedTeamID="JQ525L2MZD"
-    ;;
--- a/fragments/labels/adobereaderdc-update.txt
+++ b/fragments/labels/adobereaderdc-update.txt
@@ -1,10 +0,0 @@
-
-adobereaderdc-update)
-    name="Adobe Acrobat Reader DC"
-    type="pkgInDmg"
-    downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo http://ardownload.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDCUpd"$adobecurrent"_MUI.dmg)
-    appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt)
-    #appNewVersion=$(curl -s -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" https://get.adobe.com/reader/ | grep ">Version" | sed -E 's/.*Version 20([0-9.]*)<.*/\1/g') # credit: Søren Theilgaard (@theilgaard)
-    expectedTeamID="JQ525L2MZD"
-    blockingProcesses=( "AdobeReader" )
-    ;;
--- a/fragments/labels/adobereaderdc.txt
+++ b/fragments/labels/adobereaderdc.txt
@@ -1,12 +0,0 @@
-
-adobereaderdc|\
-adobereaderdc-install)
-    name="Adobe Acrobat Reader DC"
-    type="pkgInDmg"
-    packageID="com.adobe.acrobat.DC.reader.app.pkg.MUI"
-    downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\]",' | head -n 1 | cut -d \" -f 4)
-    appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt)
-    #appNewVersion=$(curl -s -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" https://get.adobe.com/reader/ | grep ">Version" | sed -E 's/.*Version 20([0-9.]*)<.*/\1/g') # credit: Søren Theilgaard (@theilgaard)
-    expectedTeamID="JQ525L2MZD"
-    blockingProcesses=( "AdobeReader" )
-    ;;
--- a/fragments/labels/aircall.txt
+++ b/fragments/labels/aircall.txt
@@ -1,8 +0,0 @@
-
-aircall)
-    # credit: @kris-anderson
-    name="Aircall"
-    type="dmg"
-    downloadURL="https://electron.aircall.io/download/osx"
-    expectedTeamID="3ML357Q795"
-    ;;
--- a/fragments/labels/airserver.txt
+++ b/fragments/labels/airserver.txt
@@ -1,9 +0,0 @@
-
-airserver)
-    # credit: AP Orlebeke (@apizz)
-    name="AirServer"
-    type="dmg"
-    downloadURL="https://www.airserver.com/download/mac/latest"
-    #appNewVersion=$() # Cannot find version history or release notes on home page
-    expectedTeamID="6C755KS5W3"
-    ;;
--- a/fragments/labels/aldente.txt
+++ b/fragments/labels/aldente.txt
@@ -1,8 +0,0 @@
-
-aldente)
-    name="AlDente"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit davidwernhart AlDente)
-    appNewVersion=$(versionFromGit davidwernhart AlDente)
-    expectedTeamID="3WVC84GB99"
-    ;;
--- a/fragments/labels/alfred.txt
+++ b/fragments/labels/alfred.txt
@@ -1,10 +0,0 @@
-
-alfred)
-    # credit: AP Orlebeke (@apizz)
-    name="Alfred"
-    type="dmg"
-    downloadURL=$(curl -fs https://www.alfredapp.com | awk -F '"' "/dmg/ {print \$2}" | head -1)
-    appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*Alfred_([0-9.]*)_.*/\1/')
-    appName="Alfred 4.app"
-    expectedTeamID="XZZXE9SED4"
-    ;;
--- a/fragments/labels/alttab.txt
+++ b/fragments/labels/alttab.txt
@@ -1,8 +0,0 @@
-
-alttab)
-    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-    name="AltTab"
-    type="zip"
-    downloadURL=$(downloadURLFromGit lwouis alt-tab-macos)
-    expectedTeamID="QXD7GW8FHY"
-    ;;
--- a/fragments/labels/amazonchime.txt
+++ b/fragments/labels/amazonchime.txt
@@ -1,9 +0,0 @@
-
-amazonchime)
-    # credit: @dvsjr macadmins slack
-    name="Amazon Chime"
-    type="dmg"
-    downloadURL="https://clients.chime.aws/mac/latest"
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z.\-]*-([0-9.]*)\..*/\1/g' )
-    expectedTeamID="94KV3E626L"
-    ;;
--- a/fragments/labels/amazonworkspaces.txt
+++ b/fragments/labels/amazonworkspaces.txt
@@ -1,9 +0,0 @@
-
-amazonworkspaces)
-    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-    name="Workspaces"
-    type="pkg"
-    downloadURL="https://d2td7dqidlhjx7.cloudfront.net/prod/global/osx/WorkSpaces.pkg"
-    appNewVersion=$(curl -fs https://d2td7dqidlhjx7.cloudfront.net/prod/iad/osx/WorkSpacesAppCast_macOS_20171023.xml | grep -o "Version*.*<" | head -1 | cut -d " " -f2 | cut -d "<" -f1)
-    expectedTeamID="94KV3E626L"
-    ;;
--- a/fragments/labels/androidfiletransfer.txt
+++ b/fragments/labels/androidfiletransfer.txt
@@ -1,8 +0,0 @@
-
-androidfiletransfer)
-    #credit: Sam Ess (saess-sep)
-    name="Android File Transfer"
-    type="dmg"
-    downloadURL="https://dl.google.com/dl/androidjumper/mtp/current/AndroidFileTransfer.dmg"
-    expectedTeamID="EQHXZ8M8AV"
-    ;;
--- a/fragments/labels/anydesk.txt
+++ b/fragments/labels/anydesk.txt
@@ -1,8 +0,0 @@
-
-anydesk)
-    name="AnyDesk"
-    type="dmg"
-    downloadURL="https://download.anydesk.com/anydesk.dmg"
-    appNewVersion="$(curl -fs https://anydesk.com/da/downloads/mac-os | grep -i "d-block" | grep -E -o ">v[0-9.]* .*MB" | sed -E 's/.*v([0-9.]*) .*/\1/g')"
-    expectedTeamID="KU6W3B6JMZ"
-    ;;
--- a/fragments/labels/apparency.txt
+++ b/fragments/labels/apparency.txt
@@ -1,7 +0,0 @@
-
-apparency)
-    name="Apparency"
-    type="dmg"
-    downloadURL="https://www.mothersruin.com/software/downloads/Apparency.dmg"
-    expectedTeamID="936EB786NH"
-    ;;
--- a/fragments/labels/appcleaner.txt
+++ b/fragments/labels/appcleaner.txt
@@ -1,9 +0,0 @@
-
-appcleaner)
-    # credit: Tadayuki Onishi (@kenchan0130)
-    name="AppCleaner"
-    type="zip"
-    downloadURL=$(curl -fs https://freemacsoft.net/appcleaner/Updates.xml | xpath '//rss/channel/*/enclosure/@url' 2>/dev/null | tr " " "
-" | sort | tail -1 | cut -d '"' -f 2)
-    expectedTeamID="X85ZX835W9"
-    ;;
--- a/fragments/labels/applenyfonts.txt
+++ b/fragments/labels/applenyfonts.txt
@@ -1,8 +0,0 @@
-
-applenyfonts)
-    name="Apple New York Font Collection"
-    type="pkgInDmg"
-    downloadURL="https://devimages-cdn.apple.com/design/resources/download/NY-Font.dmg"
-    packageID="com.apple.pkg.NYFonts"
-    expectedTeamID="Development Update"
-    ;;
--- a/fragments/labels/applesfcompact.txt
+++ b/fragments/labels/applesfcompact.txt
@@ -1,8 +0,0 @@
-
-applesfcompact)
-    name="San Francisco Compact"
-    type="pkgInDmg"
-    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Compact.dmg"
-    packageID="com.apple.pkg.SanFranciscoCompact"
-    expectedTeamID="Development Update"
-    ;;
--- a/fragments/labels/applesfmono.txt
+++ b/fragments/labels/applesfmono.txt
@@ -1,8 +0,0 @@
-
-applesfmono)
-    name="San Francisco Mono"
-    type="pkgInDmg"
-    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Mono.dmg"
-    packageID="com.apple.pkg.SFMonoFonts"
-    expectedTeamID="Software Update"
-    ;;
--- a/fragments/labels/applesfpro.txt
+++ b/fragments/labels/applesfpro.txt
@@ -1,8 +0,0 @@
-
-applesfpro)
-    name="San Francisco Pro"
-    type="pkgInDmg"
-    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Pro.dmg"
-    packageID="com.apple.pkg.SanFranciscoPro"
-    expectedTeamID="Development Update"
-    ;;
--- a/fragments/labels/aquaskk.txt
+++ b/fragments/labels/aquaskk.txt
@@ -1,9 +0,0 @@
-
-aquaskk)
-    # credit: Tadayuki Onishi (@kenchan0130)
-    name="aquaskk"
-    type="pkg"
-    downloadURL=$(downloadURLFromGit codefirst aquaskk)
-    appNewVersion=$(versionFromGit codefirst aquaskk)
-    expectedTeamID="FPZK4WRGW7"
-    ;;
--- a/fragments/labels/arq7.txt
+++ b/fragments/labels/arq7.txt
@@ -1,9 +0,0 @@
-
-arq7)
-    name="Arq7"
-    type="pkg"
-    packageID="com.haystacksoftware.Arq"
-    downloadURL="https://arqbackup.com/download/arqbackup/Arq7.pkg"
-    appNewVersion="$(curl -fs "https://arqbackup.com" | grep -io "version .*[0-9.]*.* for macOS" | cut -d ">" -f2 | cut -d "<" -f1)"
-    expectedTeamID="48ZCSDVL96"
-    ;;
--- a/fragments/labels/atext.txt
+++ b/fragments/labels/atext.txt
@@ -1,8 +0,0 @@
-
-atext)
-    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-    name="aText"
-    type="dmg"
-    downloadURL="https://trankynam.com/atext/downloads/aText.dmg"
-    expectedTeamID="KHEMQ2FD9E"
-    ;;
--- a/fragments/labels/atom.txt
+++ b/fragments/labels/atom.txt
@@ -1,9 +0,0 @@
-
-atom)
-    name="Atom"
-    type="zip"
-    archiveName="atom-mac.zip"
-    downloadURL=$(downloadURLFromGit atom atom )
-    appNewVersion=$(versionFromGit atom atom)
-    expectedTeamID="VEKTX9H2N7"
-    ;;
--- a/fragments/labels/audacity.txt
+++ b/fragments/labels/audacity.txt
@@ -1,9 +0,0 @@
-
-audacity)
-    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-    name="Audacity"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit audacity audacity)
-    appNewVersion=$(versionFromGit audacity audacity)
-    expectedTeamID="T3N4JQ7YY6"
-    ;;
--- a/fragments/labels/autodmg.txt
+++ b/fragments/labels/autodmg.txt
@@ -1,9 +0,0 @@
-
-autodmg)
-    # credit: Mischa van der Bent (@mischavdbent)
-    name="AutoDMG"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit MagerValp AutoDMG)
-    appNewVersion=$(versionFromGit MagerValp AutoDMG)
-    expectedTeamID="5KQ3D3FG5H"
-    ;;
--- a/fragments/labels/autopkgr.txt
+++ b/fragments/labels/autopkgr.txt
@@ -1,10 +0,0 @@
-
-autopkgr)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="AutoPkgr"
-    type="dmg"
-    #downloadURL=$(curl -fs "https://api.github.com/repos/lindegroup/autopkgr/releases/latest" | awk -F '"' "/browser_download_url/ && /dmg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
-    downloadURL=$(downloadURLFromGit lindegroup autopkgr)
-    appNewVersion=$(versionFromGit lindegroup autopkgr)
-    expectedTeamID="JVY2ZR6SEF"
-    ;;
--- a/fragments/labels/aviatrix.txt
+++ b/fragments/labels/aviatrix.txt
@@ -1,8 +0,0 @@
-
-aviatrix)
-    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-    name="Aviatrix VPN Client"
-    type="pkg"
-    downloadURL="https://s3-us-west-2.amazonaws.com/aviatrix-download/AviatrixVPNClient/AVPNC_mac.pkg"
-    expectedTeamID="32953Z7NBN"
-    ;;
--- a/fragments/labels/awscli2.txt
+++ b/fragments/labels/awscli2.txt
@@ -1,10 +0,0 @@
-
-awscli2)
-    # credit: Bilal Habib (@Pro4TLZZ)
-    name="AWSCLI"
-    type="pkg"
-    packageID="com.amazon.aws.cli2"
-    downloadURL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
-    appNewVersion=$( curl -fs "https://raw.githubusercontent.com/aws/aws-cli/v2/CHANGELOG.rst" | grep -i "CHANGELOG" -a4 | grep "[0-9.]" )
-    expectedTeamID="94KV3E626L"
-    ;;
--- a/fragments/labels/awsvpnclient.txt
+++ b/fragments/labels/awsvpnclient.txt
@@ -1,9 +0,0 @@
-
-awsvpnclient)
-    name="AWS VPN Client"
-    type="pkg"
-    downloadURL="https://d20adtppz83p9s.cloudfront.net/OSX/latest/AWS_VPN_Client.pkg"
-    expectedTeamID="94KV3E626L"
-    appNewVersion=$(curl -is "https://beta2.communitypatch.com/jamf/v1/ba1efae22ae74a9eb4e915c31fef5dd2/patch/AWSVPNClient" | grep currentVersion | tr ',' '
-' | grep currentVersion | cut -d '"' -f 4)
-    ;;
--- a/fragments/labels/balenaetcher.txt
+++ b/fragments/labels/balenaetcher.txt
@@ -1,8 +0,0 @@
-
-balenaetcher)
-    name="balenaEtcher"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit balena-io etcher )
-    appNewVersion=$(versionFromGit balena-io etcher )
-    expectedTeamID="66H43P8FRG"
-    ;;
--- a/fragments/labels/balsamiqwireframes.txt
+++ b/fragments/labels/balsamiqwireframes.txt
@@ -1,8 +0,0 @@
-
-balsamiqwireframes)
-    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-    name="Balsamiq Wireframes"
-    type="dmg"
-    downloadURL=https://builds.balsamiq.com/bwd/$(curl -fs "https://builds.balsamiq.com" | awk -F "<Key>bwd/" "/dmg/ {print \$3}" | awk -F "</Key>" "{print \$1}" | sed "s/ /%20/g")
-    expectedTeamID="3DPKD72KQ7"
-    ;;
--- a/fragments/labels/bartender.txt
+++ b/fragments/labels/bartender.txt
@@ -1,8 +0,0 @@
-
-bartender)
-    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-    name="Bartender 4"
-    type="dmg"
-    downloadURL="https://www.macbartender.com/B2/updates/B4Latest/Bartender%204.dmg"
-    expectedTeamID="8DD663WDX4"
-    ;;
--- a/fragments/labels/basecamp3.txt
+++ b/fragments/labels/basecamp3.txt
@@ -1,9 +0,0 @@
-
-basecamp3)
-    #credit: @matins
-    name="Basecamp 3"
-    type="dmg"
-    downloadURL="https://bc3-desktop.s3.amazonaws.com/mac/basecamp3.dmg"
-    expectedTeamID="2WNYUYRS7G"
-    appName="Basecamp 3.app"
-    ;;
--- a/fragments/labels/bbedit.txt
+++ b/fragments/labels/bbedit.txt
@@ -1,8 +0,0 @@
-
-bbedit)
-    name="BBEdit"
-    type="dmg"
-    downloadURL=$(curl -s https://versioncheck.barebones.com/BBEdit.xml | grep dmg | sort | tail -n1 | cut -d">" -f2 | cut -d"<" -f1)
-    appNewVersion=$(curl -s https://versioncheck.barebones.com/BBEdit.xml | grep dmg | sort  | tail -n1 | sed -E 's/.*BBEdit_([0-9 .]*)\.dmg.*/\1/')
-    expectedTeamID="W52GZAXT98"
-    ;;
--- a/fragments/labels/bettertouchtool.txt
+++ b/fragments/labels/bettertouchtool.txt
@@ -1,9 +0,0 @@
-
-bettertouchtool)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="BetterTouchTool"
-    type="zip"
-    downloadURL="https://folivora.ai/releases/BetterTouchTool.zip"
-    appNewVersion=$(curl -fs https://updates.folivora.ai/bettertouchtool_release_notes.html | grep BetterTouchTool | head -n 2 | tail -n 1 | sed -E 's/.* ([0-9\.]*) .*/\1/g')
-    expectedTeamID="DAFVSXZ82P"
-    ;;
--- a/fragments/labels/bitwarden.txt
+++ b/fragments/labels/bitwarden.txt
@@ -1,8 +0,0 @@
-
-bitwarden)
-    name="Bitwarden"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit bitwarden desktop )
-    appNewVersion=$(versionFromGit bitwarden desktop )
-    expectedTeamID="LTZ2PFU5D6"
-    ;;
--- a/fragments/labels/blender.txt
+++ b/fragments/labels/blender.txt
@@ -1,8 +0,0 @@
-
-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)
-    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
-    expectedTeamID="68UA947AUU"
-    ;;
--- a/fragments/labels/bluejeans.txt
+++ b/fragments/labels/bluejeans.txt
@@ -1,12 +0,0 @@
-
-bluejeans)
-    name="BlueJeans"
-    type="pkg"
-    if [[ $(arch) == "arm64" ]]; then
-        downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.*arm.*.pkg" )
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.*x86.*.dmg" | sed 's/dmg/pkg/g')
-    fi
-    appNewVersion=$(echo $downloadURL | cut -d '/' -f6)
-    expectedTeamID="HE4P42JBGN"
-    ;;
--- a/fragments/labels/boxdrive.txt
+++ b/fragments/labels/boxdrive.txt
@@ -1,13 +0,0 @@
-
-boxdrive)
-    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-    name="Box"
-    type="pkg"
-    if [[ $(arch) == "arm64" ]]; then
-        #Note: https://support.box.com/hc/en-us/articles/1500004479962-Box-Drive-support-on-devices-with-M1-chips
-        downloadURL="https://e3.boxcdn.net/desktop/pre-releases/mac/BoxDrive.2.20.140-M1-beta.pkg"
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://e3.boxcdn.net/box-installers/desktop/releases/mac/Box.pkg"
-    fi
-    expectedTeamID="M683GB7CPW"
-    ;;
--- a/fragments/labels/brave.txt
+++ b/fragments/labels/brave.txt
@@ -1,18 +0,0 @@
-
-brave)
-    # credit: @securitygeneration
-    name="Brave Browser"
-    type="dmg"
-    if [[ $(arch) != "i386" ]]; then
-        printlog "Architecture: arm64 (not i386)"
-        downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osxarm64/release | grep -i "^location" | awk '{print $2}' | tr -d '
-')
-    else
-        printlog "Architecture: i386"
-        downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osx/release | grep -i "^location" | awk '{print $2}' | tr -d '
-')
-    fi
-#    downloadURL=$(curl --location --fail --silent "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-    appNewVersion=$(curl --location --fail --silent "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@sparkle:shortVersionString' 2>/dev/null  | cut -d '"' -f 2)
-    expectedTeamID="KL8N8XSYF4"
-    ;;
--- a/fragments/labels/brokenappname.txt
+++ b/fragments/labels/brokenappname.txt
@@ -1,7 +0,0 @@
-
-brokenappname)
-    name="brokenapp"
-    type="dmg"
-    downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
-    expectedTeamID="EQHXZ8M8AV"
-    ;;
--- a/fragments/labels/brokendownloadurl.txt
+++ b/fragments/labels/brokendownloadurl.txt
@@ -1,7 +0,0 @@
-
-brokendownloadurl)
-    name="Google Chrome"
-    type="dmg"
-    downloadURL="https://broken.com/broken.dmg"
-    expectedTeamID="EQHXZ8M8AV"
-    ;;
--- a/fragments/labels/brokenteamid.txt
+++ b/fragments/labels/brokenteamid.txt
@@ -1,7 +0,0 @@
-
-brokenteamid)
-    name="Google Chrome"
-    type="dmg"
-    downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
-    expectedTeamID="broken"
-    ;;
--- a/fragments/labels/caffeine.txt
+++ b/fragments/labels/caffeine.txt
@@ -1,9 +0,0 @@
-
-caffeine)
-    name="Caffeine"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit IntelliScape caffeine)
-    appNewVersion=$(versionFromGit IntelliScape caffeine)
-    expectedTeamID="YD6LEYT6WZ"
-    blockingProcesses=( Caffeine )
-    ;;
--- a/fragments/labels/cakebrew.txt
+++ b/fragments/labels/cakebrew.txt
@@ -1,8 +0,0 @@
-
-cakebrew)
-    name="Cakebrew"
-    type="zip"
-    downloadURL=$(curl -fsL "https://www.cakebrew.com/appcast/profileInfo.php" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-    appNewVersion=$( curl -fsL "https://www.cakebrew.com/appcast/profileInfo.php" | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f 2 )
-    expectedTeamID="R85D3K8ATT"
-    ;;
--- a/fragments/labels/calibre.txt
+++ b/fragments/labels/calibre.txt
@@ -1,9 +0,0 @@
-
-calibre)
-    # credit: Drew Diver (@grumpydrew on MacAdmins Slack)
-    name="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' )
-    expectedTeamID="NTY7FVCEKP"
-    ;;
--- a/fragments/labels/camostudio.txt
+++ b/fragments/labels/camostudio.txt
@@ -1,9 +0,0 @@
-
-camostudio)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="Camo Studio"
-    type="zip"
-    downloadURL="https://reincubate.com/res/labs/camo/camo-macos-latest.zip"
-    appNewVersion=$(curl -s -L  https://reincubate.com/support/camo/release-notes/ | grep -m2 "has-m-t-0" | head -1 | cut -d ">" -f2 | cut -d " " -f1)
-    expectedTeamID="Q248YREB53"
-    ;;
--- a/fragments/labels/camtasia.txt
+++ b/fragments/labels/camtasia.txt
@@ -1,7 +0,0 @@
-
-camtasia)
-    name="Camtasia 2020"
-    type="dmg"
-    downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg
-    expectedTeamID="7TQL462TU8"
-    ;;
--- a/fragments/labels/citrixworkspace.txt
+++ b/fragments/labels/citrixworkspace.txt
@@ -1,9 +0,0 @@
-
-citrixworkspace)
-    #credit: Erik Stam (@erikstam) and #Philipp on MacAdmins Slack
-    name="Citrix Workspace"
-    type="pkgInDmg"
-    downloadURL="https:"$(curl -s -L "https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html#ctx-dl-eula-external" | grep "dmg?" | sed "s/.*rel=.\(.*\)..id=.*/\1/") # http://downloads.citrix.com/18823/CitrixWorkspaceApp.dmg?__gda__=1605791892_edc6786a90eb5197fb226861a8e27aa8
-    appNewVersion=$(curl -fs https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html | grep "<p>Version" | head -1 | cut -d " " -f1 | cut -d ";" -f2 | cut -d "." -f 1-3)
-    expectedTeamID="S272Y5R93J"
-    ;;
--- a/fragments/labels/clevershare2.txt
+++ b/fragments/labels/clevershare2.txt
@@ -1,10 +0,0 @@
-
-clevershare2)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="Clevershare"
-    type="dmg"
-    downloadURL=$(curl -fs https://archive.clevertouch.com/clevershare2g | grep -i "_Mac" | tr '"' "
-" | grep "^http.*dmg")
-    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z-]*_Mac\.([0-9.]*)\.[0-9]*\.dmg$/\1/g' )
-    expectedTeamID="P76M9BE8DQ"
-    ;;
--- a/fragments/labels/clickshare.txt
+++ b/fragments/labels/clickshare.txt
@@ -1,8 +0,0 @@
-
-clickshare)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="ClickShare"
-    type="appInDmgInZip"
-    downloadURL=https://www.barco.com$(curl -fs "https://www.barco.com/en/clickshare/app" | grep -E -o '(\/\S*Download\?FileNumber=R3306192\S*ShowDownloadPage=False)' | tail -1)
-    expectedTeamID="P6CDJZR997"
-    ;;
--- a/fragments/labels/code42.txt
+++ b/fragments/labels/code42.txt
@@ -1,9 +0,0 @@
-
-code42)
-    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-    name="Code42"
-    type="pkgInDmg"
-    downloadURL=https://download.code42.com/installs/agent/latest-mac.dmg
-    expectedTeamID="9YV9435DHD"
-    blockingProcesses=( NONE )
-    ;;
--- a/fragments/labels/coderunner.txt
+++ b/fragments/labels/coderunner.txt
@@ -1,8 +0,0 @@
-
-coderunner)
-    # credit: Erik Stam (@erikstam)
-    name="CodeRunner"
-    type="zip"
-    downloadURL="https://coderunnerapp.com/download"
-    expectedTeamID="R4GD98AJF9"
-    ;;
--- a/fragments/labels/cormorant.txt
+++ b/fragments/labels/cormorant.txt
@@ -1,9 +0,0 @@
-
-cormorant)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="Cormorant"
-    type="zip"
-    downloadURL=$(curl -fs https://eclecticlight.co/downloads/ | grep -i $name | grep zip | sed -E 's/.*href=\"(https.*)\">.*/\1/g')
-    appNewVersion=$(curl -fs https://eclecticlight.co/downloads/ | grep zip | grep -o -E "$name [0-9.]*" | awk '{print $2}')
-    expectedTeamID="QWY4LRW926"
-    ;;
--- a/fragments/labels/cryptomator.txt
+++ b/fragments/labels/cryptomator.txt
@@ -1,8 +0,0 @@
-
-cryptomator)
-    name="Cryptomator"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit cryptomator cryptomator)
-    appNewVersion=$(versionFromGit cryptomator cryptomator)
-    expectedTeamID="YZQJQUHA3L"
-    ;;
--- a/fragments/labels/cyberduck.txt
+++ b/fragments/labels/cyberduck.txt
@@ -1,8 +0,0 @@
-
-cyberduck)
-    name="Cyberduck"
-    type="zip"
-    downloadURL=$(curl -fs https://version.cyberduck.io/changelog.rss | xpath '//rss/channel/item/enclosure/@url' 2>/dev/null | cut -d '"' -f 2 )
-    appNewVersion=$(curl -fs https://version.cyberduck.io/changelog.rss | xpath '//rss/channel/item/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f 2 )
-    expectedTeamID="G69SCX94XU"
-    ;;
--- a/fragments/labels/dangerzone.txt
+++ b/fragments/labels/dangerzone.txt
@@ -1,8 +0,0 @@
-
-dangerzone)
-    # credit: Micah Lee (@micahflee)
-    name="Dangerzone"
-    type="dmg"
-    downloadURL=$(curl -s https://dangerzone.rocks/ | grep https://github.com/firstlookmedia/dangerzone/releases/download | grep \.dmg | cut -d'"' -f2)
-    expectedTeamID="P24U45L8P5"
-    ;;
--- a/fragments/labels/darktable.txt
+++ b/fragments/labels/darktable.txt
@@ -1,9 +0,0 @@
-
-darktable)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="darktable"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit darktable-org darktable)
-    appNewVersion=$(versionFromGit darktable-org darktable)
-    expectedTeamID="85Q3K4KQRY"
-    ;;
--- a/fragments/labels/dbeaverce.txt
+++ b/fragments/labels/dbeaverce.txt
@@ -1,8 +0,0 @@
-
-dbeaverce)
-    name="DBeaver"
-    type="dmg"
-    downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg"
-    expectedTeamID="42B6MDKMW8"
-    blockingProcesses=( dbeaver )
-    ;;
--- a/fragments/labels/debookee.txt
+++ b/fragments/labels/debookee.txt
@@ -1,7 +0,0 @@
-
-debookee)
-    name="Debookee"
-    type="zip"
-    downloadURL=$(curl --location --fail --silent "https://www.iwaxx.com/debookee/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-    expectedTeamID="AATLWWB4MZ"
-    ;;
--- a/fragments/labels/defaultfolderx.txt
+++ b/fragments/labels/defaultfolderx.txt
@@ -1,8 +0,0 @@
-
-defaultfolderx)
-    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-    name="Default Folder X"
-    type="dmg"
-    downloadURL=$(curl -fs "https://www.stclairsoft.com/cgi-bin/dl.cgi?DX" | awk -F '"' "/dmg/ {print \$4}" | head -2 | tail -1)
-    expectedTeamID="7HK42V8R9D"
-    ;;
--- a/fragments/labels/depnotify.txt
+++ b/fragments/labels/depnotify.txt
@@ -1,8 +0,0 @@
-
-depnotify)
-    name="DEPNotify"
-    type="zip"
-    downloadURL="https://files.nomad.menu/DEPNotify.zip"
-    expectedTeamID="VRPY9KHGX6"
-    targetDir="/Applications/Utilities"
-    ;;
--- a/fragments/labels/desktoppr.txt
+++ b/fragments/labels/desktoppr.txt
@@ -1,10 +0,0 @@
-
-desktoppr)
-    name="desktoppr"
-    type="pkg"
-    packageID="com.scriptingosx.desktoppr"
-    downloadURL=$(downloadURLFromGit "scriptingosx" "desktoppr")
-    appNewVersion=$(versionFromGit "scriptingosx" "desktoppr")
-    expectedTeamID="JME5BW3F3R"
-    blockingProcesses=( NONE )
-    ;;
--- a/fragments/labels/detectxswift.txt
+++ b/fragments/labels/detectxswift.txt
@@ -1,9 +0,0 @@
-
-detectxswift)
-    # credit: AP Orlebeke (@apizz)
-    name="DetectX Swift"
-    type="zip"
-    downloadURL="https://s3.amazonaws.com/sqwarq.com/PublicZips/DetectX_Swift.app.zip"
-    appNewVersion=$(curl -fs https://s3.amazonaws.com/sqwarq.com/AppCasts/dtxswift_release_notes.html | grep Version | head -1 | sed -E 's/.*Version ([0-9.]*)\<.*/\1/')
-    expectedTeamID="MAJ5XBJSG3"
-    ;;
--- a/fragments/labels/devonthink.txt
+++ b/fragments/labels/devonthink.txt
@@ -1,13 +0,0 @@
-
-devonthink)
-    # It's a zipped dmg file, needs function installAppInDmgInZip
-    # credit: Søren Theilgaard (@theilgaard)
-    name="DEVONthink 3"
-    type="appInDmgInZip"
-    downloadURL=$( curl -fs https://www.devontechnologies.com/apps/devonthink | grep -i "download.devon" | tr '"' '
-' | tr "'" '
-' | grep -e '^https://' )
-    appNewVersion=$( echo ${downloadURL} | tr '/' '
-' | grep "[0-9]" | grep "[.]" | head -1 )
-    expectedTeamID="679S2QUWR8"
-    ;;
--- a/fragments/labels/dialpad.txt
+++ b/fragments/labels/dialpad.txt
@@ -1,8 +0,0 @@
-
-dialpad)
-    # credit: @ehosaka
-    name="Dialpad"
-    type="dmg"
-    downloadURL="https://storage.googleapis.com/dialpad_native/osx/Dialpad.dmg"
-    expectedTeamID="9V29MQSZ9M"
-    ;;
--- a/fragments/labels/discord.txt
+++ b/fragments/labels/discord.txt
@@ -1,7 +0,0 @@
-
-discord)
-    name="Discord"
-    type="dmg"
-    downloadURL="https://discordapp.com/api/download?platform=osx"
-    expectedTeamID="53Q6R32WPB"
-    ;;
--- a/fragments/labels/docker.txt
+++ b/fragments/labels/docker.txt
@@ -1,14 +0,0 @@
-
-docker)
-    # credit: @securitygeneration
-    name="Docker"
-    type="dmg"
-    #downloadURL="https://download.docker.com/mac/stable/Docker.dmg"
-    if [[ $(arch) == arm64 ]]; then
-     downloadURL="https://desktop.docker.com/mac/stable/arm64/Docker.dmg"
-    elif [[ $(arch) == i386 ]]; then
-     downloadURL="https://desktop.docker.com/mac/stable/amd64/Docker.dmg"
-    fi
-    appNewVersion=$(curl -ifs https://docs.docker.com/docker-for-mac/release-notes/ | grep ">Docker Desktop Community" | head -1 | sed -n -e 's/^.*Community //p' | cut -d '<' -f1)
-    expectedTeamID="9BNSXJN65R"
-    ;;
--- a/fragments/labels/drift.txt
+++ b/fragments/labels/drift.txt
@@ -1,8 +0,0 @@
-
-drift)
-    # credit Elena Ackley (@elenaelago)
-    name="Drift"
-    type="dmg"
-    downloadURL="https://drift-prod-desktop-installers.s3.amazonaws.com/mac/Drift-latest.dmg"
-    expectedTeamID="78559WUUR9"
-    ;;
--- a/fragments/labels/dropbox.txt
+++ b/fragments/labels/dropbox.txt
@@ -1,7 +0,0 @@
-
-dropbox)
-    name="Dropbox"
-    type="dmg"
-    downloadURL="https://www.dropbox.com/download?plat=mac&full=1"
-    expectedTeamID="G7HH3F8CAK"
-    ;;
--- a/fragments/labels/easeusdatarecoverywizard.txt
+++ b/fragments/labels/easeusdatarecoverywizard.txt
@@ -1,10 +0,0 @@
-
-easeusdatarecoverywizard)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="EaseUS Data Recovery Wizard"
-    type="dmg"
-    downloadURL=$( curl -fsIL https://down.easeus.com/product/mac_drw_free_setup | grep -i "^location" | awk '{print $2}' | tr -d '
-' )
-    #appNewVersion=""
-    expectedTeamID="DLLVW95FSM"
-    ;;
--- a/fragments/labels/egnyte.txt
+++ b/fragments/labels/egnyte.txt
@@ -1,9 +0,0 @@
-
-egnyte)
-    # credit: #MoeMunyoki from MacAdmins Slack
-    name="Egnyte Connect"
-    type="pkg"
-    downloadURL="https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/latest/EgnyteConnectMac.pkg"
-    expectedTeamID="FELUD555VC"
-    blockingProcesses=( NONE )
-    ;;
--- a/fragments/labels/element.txt
+++ b/fragments/labels/element.txt
@@ -1,8 +0,0 @@
-
-element)
-    name="Element"
-    type="dmg"
-    downloadURL="https://packages.riot.im/desktop/install/macos/Element.dmg"
-    appNewVersion=$(versionFromGit vector-im element-desktop)
-    expectedTeamID="7J4U792NQT"
-    ;;
--- a/fragments/labels/eraseinstall.txt
+++ b/fragments/labels/eraseinstall.txt
@@ -1,7 +0,0 @@
-
-eraseinstall)
-    name="EraseInstall"
-    type="pkg"
-    downloadURL=https://bitbucket.org$(curl -fs https://bitbucket.org/prowarehouse-nl/erase-install/downloads/ | grep pkg | cut -d'"' -f2 | head -n 1)
-    expectedTeamID="R55HK5K86Y"
-    ;;
--- a/fragments/labels/etrecheck.txt
+++ b/fragments/labels/etrecheck.txt
@@ -1,8 +0,0 @@
-
-etrecheck)
-    # credit: @dvsjr macadmins slack
-    name="EtreCheckPro"
-    type="zip"
-    downloadURL="https://cdn.etrecheck.com/EtreCheckPro.zip"
-    expectedTeamID="U87NE528LC"
-    ;;
--- a/fragments/labels/evernote.txt
+++ b/fragments/labels/evernote.txt
@@ -1,9 +0,0 @@
-
-evernote)
-    name="Evernote"
-    type="dmg"
-    downloadURL=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://evernote.com/download" | grep -i ".dmg" | cut -d '"' -f2)
-    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
-    expectedTeamID="Q79WDW8YH9"
-    appName="Evernote.app"
-    ;;
--- a/fragments/labels/exelbanstats.txt
+++ b/fragments/labels/exelbanstats.txt
@@ -1,9 +0,0 @@
-
-exelbanstats)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="Stats"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit exelban stats)
-    appNewVersion=$(versionFromGit exelban stats)
-    expectedTeamID="RP2S87B72W"
-    ;;
--- a/fragments/labels/fantastical.txt
+++ b/fragments/labels/fantastical.txt
@@ -1,9 +0,0 @@
-
-fantastical)
-    # credit: Drew Diver (@grumpydrew on MacAdmins Slack)
-    name="Fantastical"
-    type="zip"
-    downloadURL="https://flexibits.com/fantastical/download"
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)\..*/\1/g' )
-    expectedTeamID="85C27NK92C"
-    ;;
--- a/fragments/labels/favro.txt
+++ b/fragments/labels/favro.txt
@@ -1,8 +0,0 @@
-
-favro)
-    name="Favro"
-    type="dmg"
-    downloadURL="https://download.favro.com/FavroDesktop/macOS/x64/$(curl -fs https://download.favro.com/FavroDesktop/macOS/x64/Latest.html | cut -d ">" -f1 | cut -d "=" -f 4 | cut -d '"' -f1)"
-    appNewVersion="$(curl -fs https://download.favro.com/FavroDesktop/macOS/x64/Latest.html | cut -d ">" -f1 | cut -d "=" -f 4 | cut -d '"' -f1 | sed -E 's/.*-([0-9.]*)\.dmg/\1/g')"
-    expectedTeamID="PUA8Q354ZF"
-    ;;
--- a/fragments/labels/ferdi.txt
+++ b/fragments/labels/ferdi.txt
@@ -1,8 +0,0 @@
-
-ferdi)
-    name="Ferdi"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit getferdi ferdi )
-    appNewVersion=$(versionFromGit getferdi ferdi )
-    expectedTeamID="B6J9X9DWFL"
-    ;;
--- a/fragments/labels/figma.txt
+++ b/fragments/labels/figma.txt
@@ -1,7 +0,0 @@
-
-figma)
-    name="Figma"
-    type="zip"
-    downloadURL="https://desktop.figma.com/mac/Figma.zip"
-    expectedTeamID="T8RA8NE3B7"
-    ;;
--- a/fragments/labels/firefox.txt
+++ b/fragments/labels/firefox.txt
@@ -1,9 +0,0 @@
-
-firefox)
-    name="Firefox"
-    type="dmg"
-    downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
-    appNewVersion=$(/usr/bin/curl https://www.mozilla.org/en-US/firefox/releases/ --silent | /usr/bin/grep '<html' | /usr/bin/awk -F\" '{ print $8 }') # Credit: William Smith (@meck)
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
--- a/fragments/labels/firefox_da.txt
+++ b/fragments/labels/firefox_da.txt
@@ -1,9 +0,0 @@
-
-firefox_da)
-    name="Firefox"
-    type="dmg"
-    downloadURL="https://download.mozilla.org/?product=firefox-latest&amp;os=osx&amp;lang=da"
-    appNewVersion=$(/usr/bin/curl https://www.mozilla.org/en-US/firefox/releases/ --silent | /usr/bin/grep '<html' | /usr/bin/awk -F\" '{ print $8 }') # Credit: William Smith (@meck)
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
--- a/fragments/labels/firefox_intl.txt
+++ b/fragments/labels/firefox_intl.txt
@@ -1,24 +0,0 @@
-
-firefox_intl)
-    # This label will try to figure out the selected language of the user, 
-    # and install corrosponding version of Firefox
-    name="Firefox"
-    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for Firefox."
-    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
-        userLanguage=$(echo $userLanguage | cut -c 1-2)
-        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
-            userLanguage="en_US"
-        fi
-    fi
-    printlog "Using language $userLanguage for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-latest&amp;os=osx&amp;lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
-        printlog "Download not found for that language. Using en-US"
-        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
-    fi
-    appNewVersion=$(/usr/bin/curl -sl https://www.mozilla.org/en-US/firefox/releases/ | /usr/bin/grep '<html' | /usr/bin/awk -F\" '{ print $8 }') # Credit: William Smith (@meck)
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
--- a/fragments/labels/firefoxesr.txt
+++ b/fragments/labels/firefoxesr.txt
@@ -1,10 +0,0 @@
-
-firefoxesr|\
-firefoxesrpkg)
-    name="Firefox"
-    type="pkg"
-    downloadURL="https://download.mozilla.org/?product=firefox-esr-pkg-latest-ssl&os=osx"
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g')
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
--- a/fragments/labels/firefoxesr_intl.txt
+++ b/fragments/labels/firefoxesr_intl.txt
@@ -1,25 +0,0 @@
-
-firefoxesr_intl)
-    # This label will try to figure out the selected language of the user, 
-    # and install corrosponding version of Firefox ESR
-    name="Firefox"
-    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for Firefox."
-    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep -o "=$userLanguage"; then
-        userLanguage=$(echo $userLanguage | cut -c 1-2)
-        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep "=$userLanguage"; then
-            userLanguage="en_US"
-        fi
-    fi
-    printlog "Using language $userLanguage for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage"
-    # https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US
-    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
-        printlog "Download not found for that language. Using en-US"
-        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
-    fi
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g')
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
--- a/fragments/labels/firefoxpkg.txt
+++ b/fragments/labels/firefoxpkg.txt
@@ -1,8 +0,0 @@
-
-firefoxpkg)
-    name="Firefox"
-    type="pkg"
-    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
--- a/fragments/labels/front.txt
+++ b/fragments/labels/front.txt
@@ -1,8 +0,0 @@
-
-front)
-    name="Front"
-    type="dmg"
-    downloadURL="https://dl.frontapp.com/macos/Front.dmg"
-    expectedTeamID="X549L7572J"
-    Company="FrontApp. Inc."
-    ;;
--- a/fragments/labels/fsmonitor.txt
+++ b/fragments/labels/fsmonitor.txt
@@ -1,7 +0,0 @@
-
-fsmonitor)
-    name="FSMonitor"
-    type="zip"
-    downloadURL=$(curl --location --fail --silent "https://fsmonitor.com/FSMonitor/Archives/appcast2.xml" | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-    expectedTeamID="V85GBYB7B9"
-    ;;
--- a/fragments/labels/gimp.txt
+++ b/fragments/labels/gimp.txt
@@ -1,8 +0,0 @@
-
-gimp)
-    name="GIMP-2.10"
-    type="dmg"
-    downloadURL=https://$(curl -fs https://www.gimp.org/downloads/ | grep -m 1 -o "download.*gimp-.*.dmg")
-    appNewVersion=$(echo $downloadURL | cut -d "-" -f 2)
-    expectedTeamID="T25BQ8HSJF"
-    ;;
--- a/fragments/labels/githubdesktop.txt
+++ b/fragments/labels/githubdesktop.txt
@@ -1,12 +0,0 @@
-
-githubdesktop)
-    name="GitHub Desktop"
-    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-        downloadURL="https://central.github.com/deployments/desktop/desktop/latest/darwin-arm64"
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://central.github.com/deployments/desktop/desktop/latest/darwin"
-    fi
-    appNewVersion=$(curl -fsL https://central.github.com/deployments/desktop/desktop/changelog.json | awk -F '{' '/"version"/ { print $2 }' | sed -E 's/.*,\"version\":\"([0-9.]*)\".*/\1/g')
-    expectedTeamID="VEKTX9H2N7"
-    ;;
--- a/fragments/labels/golang.txt
+++ b/fragments/labels/golang.txt
@@ -1,13 +0,0 @@
-
-golang)
-    # credit: Søren Theilgaard (@theilgaard)
-    name="GoLang"
-    type="pkg"
-    packageID="org.golang.go"
-    downloadURL="$(curl -fsIL "https://golang.org$(curl -fs "https://golang.org/dl/" | grep -i "downloadBox" | grep "pkg" | tr '"' '
-' | grep "pkg")" | grep -i "^location" | awk '{print $2}' | tr -d '
-')"
-    appNewVersion="$( echo "${downloadURL}" | sed -E 's/.*\/(go[0-9.]*)\..*/\1/g' )" # Version includes letters "go"
-    expectedTeamID="EQHXZ8M8AV"
-    blockingProcesses=( NONE )
-    ;;
--- a/fragments/labels/googlechrome.txt
+++ b/fragments/labels/googlechrome.txt
@@ -1,15 +0,0 @@
-
-googlechrome)
-    name="Google Chrome"
-    type="dmg"
-    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)
-    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)
-    fi
-    expectedTeamID="EQHXZ8M8AV"
-    ;;
--- a/Show More
+++ b/Show More