updated utils/ReadMe.md (more typos and clarifications)

updated CHANGELOG, main script, Labels.txt and the assemble script ReadMe
added screencloudplayer, closes #233
2026-03-09 05:11:59 +00:00 · 2021-08-17 16:09:04 +02:00 · 2021-08-17 15:47:23 +02:00 · 2021-08-17 14:26:59 +02:00 · 2021-08-17 14:24:12 +02:00 · 2021-08-17 14:22:52 +02:00
326 changed files with 4487 additions and 476 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,22 @@
+## v0.7 - pre-release
+
+- script is now assembled from fragments. This helps avoid merging conflicts on git and allows the core team to work on the script logic while also accepting new labels. See the "Assemble Script ReadMe" for details.
 - Change in finding installed apps. We now look in /Applications and /Applications/Utilities first. If not found there, we use spotligt to find it. (We discovered a problem when a user has Parallels Windows installed with Microsoft Edge in it. Then Installomator wanted to update the app all the time, becaus spotligt found that Windows version of the app that Parallels created.)
 - Added bunch of new labels
 - Improved `buildCaseStatement.sh` a lot. It is a great start when figuring out how to create a new label for an app, or a piece of software.
 - Mosyle changed their app name from Business to Self-Service

+## v0.6 - 2021-07-14
+
+- several new and updated labels, for a total of 302
+- versionKey variable can be used to choose which Info.plist key to get the version from
+- an appCustomVersion() {} function can now be used in a label
+- with INSTALL=force, the script will not be using updateTool, but will reinstall instead
+- added quit and quit_kill options to NOTIFY
+- updated buildCaseStatement.sh
+- updated buildInstallomatorPkg.sh to use notarytool (requires Xcode 13)
+- several minor fixes
+
 ## v0.5 - 2021-04-13

 - Major update and now with help from @Theile and @Isaac
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -16,9 +16,6 @@ label="" # if no label is sent to the script, this will be used
 #
 # with contributions from many others

-VERSION='0.6.0'
-VERSIONDATE='2021-07-14'
-
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin

 # NOTE: adjust these variables:
@@ -188,7 +185,8 @@ REOPEN="yes"
 # - updateToolRunAsCurrentUser:
 #   When this variable is set (any value), $updateTool will be run as the current user.
 #
-
+VERSION="0.7.0b1"
+VERSIONDATE="2021-08-17"

 # MARK: Functions

@@ -346,7 +344,7 @@ getAppVersion() {
        fi
    fi
    
-    # get app from /Applications or find using Spotify
+    # 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
@@ -860,6 +858,24 @@ longversion)
    printlog "Installomater: version $VERSION ($VERSIONDATE)"
    exit 0
    ;;
+valuesfromarguments)
+    if [[ -z $name ]]; then
+        printlog "need to provide 'name'"
+        exit 1
+    fi
+    if [[ -z $type ]]; then
+        printlog "need to provide 'type'"
+        exit 1
+    fi
+    if [[ -z $downloadURL ]]; then
+        printlog "need to provide 'downloadURL'"
+        exit 1
+    fi
+    if [[ -z $expectedTeamID ]]; then
+        printlog "need to provide 'expectedTeamID'"
+        exit 1
+    fi
+    ;;

 # label descriptions start here
 1password7)
@@ -912,21 +928,21 @@ adobeconnect)
    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"
    ;;
-adobereaderdc|\
-adobereaderdc-install)
+adobereaderdc-update)
    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)
+    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" )
    ;;
-adobereaderdc-update)
+adobereaderdc|\
+adobereaderdc-install)
    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)
+    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"
@@ -1020,11 +1036,11 @@ applenyfonts)
    packageID="com.apple.pkg.NYFonts"
    expectedTeamID="Development Update"
    ;;
-applesfpro)
-    name="San Francisco Pro"
+applesfcompact)
+    name="San Francisco Compact"
    type="pkgInDmg"
-    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Pro.dmg"
-    packageID="com.apple.pkg.SanFranciscoPro"
+    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Compact.dmg"
+    packageID="com.apple.pkg.SanFranciscoCompact"
    expectedTeamID="Development Update"
    ;;
 applesfmono)
@@ -1034,11 +1050,11 @@ applesfmono)
    packageID="com.apple.pkg.SFMonoFonts"
    expectedTeamID="Software Update"
    ;;
-applesfcompact)
-    name="San Francisco Compact"
+applesfpro)
+    name="San Francisco Pro"
    type="pkgInDmg"
-    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Compact.dmg"
-    packageID="com.apple.pkg.SanFranciscoCompact"
+    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Font-Pro.dmg"
+    packageID="com.apple.pkg.SanFranciscoPro"
    expectedTeamID="Development Update"
    ;;
 aquaskk)
@@ -1057,6 +1073,13 @@ arq7)
    appNewVersion="$(curl -fs "https://arqbackup.com" | grep -io "version .*[0-9.]*.* for macOS" | cut -d ">" -f2 | cut -d "<" -f1)"
    expectedTeamID="48ZCSDVL96"
    ;;
+asana)
+     # credit: Lance Stephens (@pythoninthegrass on MacAdmins Slack)
+     name="Asana"
+     type="dmg"
+     downloadURL="https://desktop-downloads.asana.com/darwin_x64/prod/latest/Asana.dmg"
+     expectedTeamID="A679L395M8"
+     ;;
 atext)
    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
    name="aText"
@@ -1201,7 +1224,12 @@ boxdrive)
    fi
    expectedTeamID="M683GB7CPW"
    ;;
-brave)
+boxtools)
+     name="Box Tools"
+     type="pkg"
+     downloadURL="https://box-installers.s3.amazonaws.com/boxedit/mac/currentrelease/BoxToolsInstaller.pkg"
+     expectedTeamID="M683GB7CPW"
+     ;;brave)
    # credit: @securitygeneration
    name="Brave Browser"
    type="dmg"
@@ -1216,6 +1244,14 @@ brave)
    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"
    ;;
+caffeine)
+    name="Caffeine"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit IntelliScape caffeine)
+    appNewVersion=$(versionFromGit IntelliScape caffeine)
+    expectedTeamID="YD6LEYT6WZ"
+    blockingProcesses=( Caffeine )
+    ;;
 cakebrew)
    name="Cakebrew"
    type="zip"
@@ -1283,7 +1319,14 @@ coderunner)
    downloadURL="https://coderunnerapp.com/download"
    expectedTeamID="R4GD98AJF9"
    ;;
-cormorant)
+colourcontrastanalyser)
+     name="Colour Contrast Analyser (CCA)"
+     type="dmg"
+     downloadURL=$(downloadURLFromGit ThePacielloGroup CCAe)
+     appNewVersion=$(versionFromGit ThePacielloGroup CCAe)
+     expectedTeamID="34RS4UC3M6"
+     blockingProcesses=( NONE )
+     ;;cormorant)
    # credit: Søren Theilgaard (@theilgaard)
    name="Cormorant"
    type="zip"
@@ -1481,8 +1524,14 @@ favro)
    ;;
 ferdi)
    name="Ferdi"
-    type="dmg"
+    type="zip"
+    if [[ $(arch) == i386 ]]; then
+    downloadURL=$(curl --silent --fail "https://api.github.com/repos/getferdi/ferdi/releases/latest" \
+    | awk -F '"' "/browser_download_url/ && /mac.zip/ && ! /blockmap/ && ! /arm64-mac/ && ! /AppImage/{ print \$4 }")
+    elif [[ $(arch) == arm64 ]]; then
    downloadURL=$(downloadURLFromGit getferdi ferdi )
+    archiveName="arm64-mac.zip"
+    fi    
    appNewVersion=$(versionFromGit getferdi ferdi )
    expectedTeamID="B6J9X9DWFL"
    ;;
@@ -1639,12 +1688,6 @@ googlechromepkg)
    updateToolArguments=( -runMode oneshot -userInitiated YES )
    updateToolRunAsCurrentUser=1
    ;;
-googleearth)
-    name="Google Earth Pro"
-    type="pkgInDmg"
-    downloadURL="https://dl.google.com/earth/client/advanced/current/GoogleEarthProMac-Intel.dmg"
-    expectedTeamID="EQHXZ8M8AV"
-    ;;
 googledrive|\
 googledrivefilestream)
    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
@@ -1661,6 +1704,12 @@ googledrivebackupandsync)
    downloadURL="https://dl.google.com/drive/InstallBackupAndSync.dmg"
    expectedTeamID="EQHXZ8M8AV"
    ;;
+googleearth)
+    name="Google Earth Pro"
+    type="pkgInDmg"
+    downloadURL="https://dl.google.com/earth/client/advanced/current/GoogleEarthProMac-Intel.dmg"
+    expectedTeamID="EQHXZ8M8AV"
+    ;;
 googlejapaneseinput)
    # credit: Tadayuki Onishi (@kenchan0130)
    name="GoogleJapaneseInput"
@@ -1772,6 +1821,11 @@ hpeasystart)
 hyper)
    name="Hyper"
    type="dmg"
+    if [[ $(arch) == i386 ]]; then
+      archiveName="mac-x64.dmg"
+    elif [[ $(arch) == arm64 ]]; then
+      archiveName="mac-arm64.dmg"
+    fi
    downloadURL=$(downloadURLFromGit vercel hyper )
    appNewVersion=$(versionFromGit vercel hyper)
    expectedTeamID="JW6Y669B67"
@@ -1865,7 +1919,18 @@ jamfreenroller)
    #appNewVersion=$(versionFromGit jamf ReEnroller)
    expectedTeamID="PS2F6S478M"
    ;;
-jetbrainsintellijidea)
+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"
+     ;;jetbrainsintellijidea)
    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
    name="IntelliJ IDEA"
    type="dmg"
@@ -1922,13 +1987,6 @@ karabinerelements)
    appNewVersion=$(versionFromGit pqrs-org Karabiner-Elements)
    expectedTeamID="G43BCU2T37"
    ;;
-keyboardmaestro)
-    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-    name="Keyboard Maestro"
-    type="zip"
-    downloadURL="https://download.keyboardmaestro.com/"
-    expectedTeamID="QMHRBA4LGH"
-    ;;
 keepassxc)
    name="KeePassXC"
    type="dmg"
@@ -2082,6 +2140,217 @@ menumeters)
    appNewVersion=$(versionFromGit yujitach MenuMeters )
    expectedTeamID="95AQ7YKR5A"
    ;;
+microsoftautoupdate)
+    name="Microsoft AutoUpdate"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=830196"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.autoupdate.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "Microsoft_AutoUpdate.*pkg" | sed -E 's/[a-zA-Z_]*_([0-9.]*)_.*/\1/g' | cut -d "." -f 1-2)
+    expectedTeamID="UBF8T346G9"
+    # commented the updatetool for MSAutoupdate, because when Autoupdate is really
+    # old or broken, you want to force a new install
+    #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    #updateToolArguments=( --install --apps MSau04 )
+    ;;
+microsoftcompanyportal)
+    name="Company Portal"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=869655"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.intunecompanyportal.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/CompanyPortal_.*pkg" | cut -d "_" -f 2 | cut -d "-" -f 1)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps IMCP01 )
+    ;;
+microsoftdefenderatp)
+    name="Microsoft Defender ATP"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=2097502"
+    appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.defender.standalone"]/version' 2>/dev/null | sed -E 's/<version>([0-9.]*) .*/\1/')
+    # No version number in download url
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps WDAV00 )
+    ;;
+microsoftedge|\
+microsoftedgeconsumerstable)
+    name="Microsoft Edge"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=2069148"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.edge"]/cfbundleversion' 2>/dev/null | sed -E 's/<cfbundleversion>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/MicrosoftEdge.*pkg" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps EDGE01 )
+    ;;
+microsoftedgeenterprisestable)
+    name="Microsoft Edge"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=2093438"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.edge"]/version' 2>/dev/null | sed -E 's/<version>([0-9.]*) .*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/MicrosoftEdge.*pkg" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps EDGE01 )
+    ;;
+microsoftexcel)
+    name="Microsoft Excel"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=525135"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.excel.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps XCEL2019 )
+    ;;
+microsoftlicenseremovaltool)
+    # credit: Isaac Ordonez (@isaac) macadmins slack
+    name="Microsoft License Removal Tool"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=849815"
+    expectedTeamID="QGS93ZLCU7"
+    appNewVersion=$(curl -is "$downloadURL" | grep ocation: | grep -o "Microsoft_.*pkg" | cut -d "_" -f 5 | cut -d "." -f1-2)
+    Company="Microsoft"
+    ;;
+microsoftoffice365)
+    name="MicrosoftOffice365"
+    type="pkg"
+    packageID="com.microsoft.pkg.licensing"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=525133"
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3)
+    expectedTeamID="UBF8T346G9"
+    # using MS PowerPoint as the 'stand-in' for the entire suite
+    #appName="Microsoft PowerPoint.app"
+    blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" )
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install )
+    ;;
+microsoftofficebusinesspro)
+    name="MicrosoftOfficeBusinessPro"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=2009112"
+    expectedTeamID="UBF8T346G9"
+    # using MS PowerPoint as the 'stand-in' for the entire suite
+    appName="Microsoft PowerPoint.app"
+    blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" "Teams")
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install )
+    ;;
+microsoftonedrive)
+    name="OneDrive"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=823060"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.onedrive.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | cut -d "/" -f 6 | cut -d "." -f 1-3)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps ONDR18 )
+    ;;
+microsoftonenote)
+    name="Microsoft OneNote"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=820886"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.onenote.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps ONMC2019 )
+    ;;
+microsoftoutlook)
+    name="Microsoft Outlook"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=525137"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.outlook.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps OPIM2019 )
+    ;;
+microsoftpowerpoint)
+    name="Microsoft PowerPoint"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=525136"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.powerpoint.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps PPT32019 )
+    ;;
+microsoftremotedesktop)
+    name="Microsoft Remote Desktop"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=868963"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.remotedesktop.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_Remote_Desktop.*pkg" | cut -d "_" -f 4)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps MSRD10 )
+    ;;
+microsoftsharepointplugin)
+    # Microsoft has marked this "oldpackage", should probably not be used anymore
+    name="MicrosoftSharePointPlugin"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=800050"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/oldpackage[id="com.microsoft.sharepointplugin.standalone"]/version' 2>/dev/null | sed -E 's/<version>([0-9.]*) .*/\1/')
+    expectedTeamID="UBF8T346G9"
+    # TODO: determine blockingProcesses for SharePointPlugin
+    ;;
+microsoftskypeforbusiness)
+    name="Skype for Business"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=832978"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.skypeforbusiness.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps MSFB16 )
+    ;;
+microsoftteams)
+    name="Microsoft Teams"
+    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/<version>([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/<version>([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.
+    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 )
+    ;;
+microsoftvisualstudiocode|\
+visualstudiocode)
+    name="Visual Studio Code"
+    type="zip"
+    #downloadURL="https://go.microsoft.com/fwlink/?LinkID=620882" # Intel only
+    downloadURL="https://go.microsoft.com/fwlink/?LinkID=2156837" # Universal
+    appNewVersion=$(curl -fsL "https://code.visualstudio.com/Updates" | grep "/darwin" | grep -oiE ".com/([^>]+)([^<]+)/darwin" | cut -d "/" -f 2 | sed $'s/[^[:print:]	]//g' | head -1 )
+    expectedTeamID="UBF8T346G9"
+    appName="Visual Studio Code.app"
+    blockingProcesses=( Code )
+    ;;
+microsoftword)
+    name="Microsoft Word"
+    type="pkg"
+    downloadURL="https://go.microsoft.com/fwlink/?linkid=525134"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.word.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
+    expectedTeamID="UBF8T346G9"
+    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    updateToolArguments=( --install --apps MSWD2019 )
+    ;;
+microsoftyammer)
+    name="Yammer"
+    type="dmg"
+    downloadURL="https://aka.ms/yammer_desktop_mac"
+    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/oldpackage[id="com.microsoft.yammer.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
+    expectedTeamID="UBF8T346G9"
+    #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
+    #updateToolArguments=( --install --apps ?????? )
+    ;;
 miro)
    # credit: @matins
    name="Miro"
@@ -2295,7 +2564,13 @@ plantronicshub)
    expectedTeamID="SKWK2Q7JJV"
    appNewVersion=$(curl -fs "https://www.poly.com/in/en/support/knowledge-base/kb-article-page?lang=en_US&urlName=Hub-Release-Notes&type=Product_Information__kav" | grep -o "(*.*<span>)" | head -1 | cut -d "(" -f2 | sed 's/\<\/span\>//g' | cut -d "<" -f1)
    ;;
-plisteditpro)
+platypus)
+     name="Platypus"
+     type="zip"
+     downloadURL=$(downloadURLFromGit sveinbjornt Platypus)
+     appNewVersion=$(versionFromGit sveinbjornt Platypus)
+     expectedTeamID="55GP2M789L"
+     ;;plisteditpro)
    name="PlistEdit Pro"
    type="zip"
    downloadURL="https://www.fatcatsoftware.com/plisteditpro/PlistEditPro.zip"
@@ -2470,13 +2745,26 @@ santa)
    appNewVersion=$(versionFromGit google santa)
    expectedTeamID="EQHXZ8M8AV"
    ;;
-screamingfrogseospider)
+scaleft)
+     name="ScaleFT"
+     type="pkg"
+     downloadURL="https://dist.scaleft.com/client-tools/mac/latest/ScaleFT.pkg"
+     appNewVersion=$(curl -sf "https://dist.scaleft.com/client-tools/mac/" | awk '/dir/{i++}i==2' | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p')
+     expectedTeamID="HV2G9Z3RP5"
+     blockingProcesses=( ScaleFT )
+     ;;screamingfrogseospider)
    name="Screaming Frog SEO Spider"
    type="dmg"
    downloadURL="https://download.screamingfrog.co.uk/products/seo-spider/ScreamingFrogSEOSpider-14.3.dmg"
    expectedTeamID="CAHEVC3HZC"
    ;;
-screenflick)
+screencloudplayer)
+     # credit: AP Orlebeke (@apizz)
+     name="ScreenCloud Player"
+     type="dmg"
+     downloadURL=$(curl -sL "https://screencloud.com/download" | sed -n 's/^.*"url":"\([^"]*\)".*$/\1/p')
+     expectedTeamID="3C4F953K6P"
+     ;;screenflick)
    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
    name="Screenflick"
    type="zip"
@@ -2878,16 +3166,6 @@ vscodium)
    appName="VSCodium.app"
    blockingProcesses=( Electron )
    ;;
-webexmeetings)
-    # credit: Erik Stam (@erikstam)
-    name="Cisco Webex Meetings"
-    type="pkgInDmg"
-    downloadURL="https://akamaicdn.webex.com/client/webexapp.dmg"
-    expectedTeamID="DE8Y96K9QP"
-    targetDir="/Applications"
-    #blockingProcessesMaxCPU="5"
-    blockingProcesses=( Webex )
-    ;;
 webex|\
 webexteams)
    # credit: Erik Stam (@erikstam)
@@ -2900,6 +3178,23 @@ webexteams)
    fi
    expectedTeamID="DE8Y96K9QP"
    ;;
+webexmeetings)
+    # credit: Erik Stam (@erikstam)
+    name="Cisco Webex Meetings"
+    type="pkgInDmg"
+    downloadURL="https://akamaicdn.webex.com/client/webexapp.dmg"
+    expectedTeamID="DE8Y96K9QP"
+    targetDir="/Applications"
+    #blockingProcessesMaxCPU="5"
+    blockingProcesses=( Webex )
+    ;;
+webexteams)
+    # credit: Erik Stam (@erikstam)
+    name="Webex Teams"
+    type="dmg"
+    downloadURL="https://binaries.webex.com/WebexTeamsDesktop-MACOS-Gold/WebexTeams.dmg"
+    expectedTeamID="DE8Y96K9QP"
+    ;;
 whatsapp)
    name="WhatsApp"
    type="dmg"
@@ -2938,6 +3233,12 @@ wwdc)
    appNewVersion=$(versionFromGit insidegui WWDC)
    expectedTeamID="8C7439RJLG"
    ;;
+xeroxphaser7800)
+    name="XeroxPhaser"
+    type="pkgInDmg"
+    downloadURL=$(curl -fs "https://www.support.xerox.com/en-us/product/phaser-7800/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg")
+    expectedTeamID="G59Y3XFNFR"
+    ;;
 xink)
    name="Xink"
    type="zip"
@@ -2962,12 +3263,6 @@ yubikeymanagerqt)
    appNewVersion=$(versionFromGit Yubico yubikey-manager-qt)
    expectedTeamID="LQA3CS5MM7"
    ;;
-xeroxphaser7800)
-    name="XeroxPhaser"
-    type="pkgInDmg"
-    downloadURL=$(curl -fs "https://www.support.xerox.com/en-us/product/phaser-7800/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg")
-    expectedTeamID="G59Y3XFNFR"
-    ;;
 zappy)
    name="Zappy"
    type="appInDmgInZip"
@@ -2987,12 +3282,25 @@ zoomclient)
    name="zoom.us"
    type="pkg"
    packageID="us.zoom.pkg.videmeeting"
-    downloadURL="https://zoom.us/client/latest/Zoom.pkg"
+    if [[ $(arch) == i386 ]]; then
+       downloadURL="https://zoom.us/client/latest/Zoom.pkg"
+    elif [[ $(arch) == arm64 ]]; then
+       downloadURL="https://zoom.us/client/latest/Zoom.pkg?archType=arm64"
+    fi
    expectedTeamID="BJ4HAAB9B3"
    #appNewVersion=$(curl -is "https://beta2.communitypatch.com/jamf/v1/ba1efae22ae74a9eb4e915c31fef5dd2/patch/zoom.us" | grep currentVersion | tr ',' '\n' | grep currentVersion | cut -d '"' -f 4) # Does not match packageID
    blockingProcesses=( zoom.us )
    #blockingProcessesMaxCPU="5"
    ;;
+zoomrooms)
+    name="ZoomRooms"
+    type="pkg"
+    packageID="us.zoom.pkg.zp"
+    downloadURL="https://zoom.us/client/latest/ZoomRooms.pkg"
+    appNewVersion="$(curl -fsIL ${downloadURL} | grep -i location | cut -d "/" -f5)"
+    expectedTeamID="BJ4HAAB9B3"
+    blockingProcesses=( "ZoomPresence" )
+    ;;
 zulujdk11)
    name="Zulu JDK 11"
    type="pkgInDmg"
@@ -3032,347 +3340,19 @@ zulujdk15)
    appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
    appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
    ;;
-
-# MARK: Add new labels after this line (let us sort them in the list)
-
-
-# MARK: Add new labels above here
-
-#cdef)
-#    # cdef currently not signed
-#    # credit: Søren Theilgaard (@theilgaard)
-#    name="cdef"
-#    type="pkg"
-#    downloadURL=$(downloadURLFromGit Shufflepuck cdef)
-#    appNewVersion=$(versionFromGit Shufflepuck cdef)
-#    #expectedTeamID="EM3ER8T33A"
-#    ;;
-#fontforge)
-#    # FontForge Not signed
-#    # credit: Søren Theilgaard (@theilgaard)
-#    name="FontForge"
-#    type="dmg"
-#    downloadURL=$(downloadURLFromGit fontforge fontforge)
-#    appNewVersion=$(versionFromGit fontforge fontforge)
-#    expectedTeamID=""
-#    ;;
-#notifier)
-#    # not signed
-#    # credit: Søren Theilgaard (@theilgaard)
-#    name="dataJAR Notifier"
-#    type="pkg"
-#    #packageID="uk.co.dataJAR.Notifier" # Version 2.2.3 was actually "uk.co.dataJAR.Notifier-2.2.3" so unusable
-#    downloadURL=$(downloadURLFromGit dataJAR Notifier)
-#    appNewVersion=$(versionFromGit dataJAR Notifier)
-#    expectedTeamID=""
-#    blockingProcesses=( "Notifier" )
-#    ;;
-# packages)
-# NOTE: Packages is signed but _not_ notarized, so spctl will reject it
-#    name="Packages"
-#    type="pkgInDmg"
-#    pkgName="Install Packages.pkg"
-#    downloadURL="http://s.sudre.free.fr/Software/files/Packages.dmg"
-#    expectedTeamID="NL5M9E394P"
-#    ;;
-# powershell)
-# NOTE: powershell installers are not notarized
-#     # credit: Tadayuki Onishi (@kenchan0130)
-#     name="PowerShell"
-#     type="pkg"
-#     downloadURL=$(curl -fs "https://api.github.com/repos/Powershell/Powershell/releases/latest" \
-#     | awk -F '"' '/browser_download_url/ && /pkg/ { print $4 }' | grep -v lts )
-#     expectedTeamID="UBF8T346G9"
-#     ;;
-# powershell-lts)
-# NOTE: powershell installers are not notarized
-#     # credit: Tadayuki Onishi (@kenchan0130)
-#     name="PowerShell"
-#     type="pkg"
-#     downloadURL=$(curl -fs "https://api.github.com/repos/Powershell/Powershell/releases/latest" \
-#     | awk -F '"' '/browser_download_url/ && /pkg/ { print $4 }' | grep lts)
-#     expectedTeamID="UBF8T346G9"
-#     ;;
-# vmwarefusion)
-# TODO: vmwarefusion installation process needs testing
-#     # credit: Erik Stam (@erikstam)
-#     name="VMware Fusion"
-#     type="dmg"
-#     downloadURL="https://www.vmware.com/go/getfusion"
-#     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*Fusion-([0-9.]*)-.*/\1/g' )
-#     expectedTeamID="EG7KH642X6"
-#     ;;
-#wordmat)
-#    # WordMat currently not signed
-#    # credit: Søren Theilgaard (@theilgaard)
-#    name="WordMat"
-#    type="pkg"
-#    packageID="com.eduap.pkg.WordMat"
-#    downloadURL=$(downloadURLFromGit Eduap-com WordMat)
-#    #downloadURL=$(curl -fs "https://api.github.com/repos/Eduap-com/WordMat/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
-#    appNewVersion=$(versionFromGit Eduap-com WordMat)
-#    #curl -fs "https://api.github.com/repos/Eduap-com/WordMat/releases/latest" | grep tag_name | cut -d '"' -f 4 | sed 's/[^0-9\.]//g'
-#    expectedTeamID=""
-#    ;;
-
-
-# MARK: Microsoft
-
-# msupdate codes from:
-# https://docs.microsoft.com/en-us/deployoffice/mac/update-office-for-mac-using-msupdate
-
-# download link IDs from: https://macadmin.software
-
-microsoftautoupdate)
-    name="Microsoft AutoUpdate"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=830196"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.autoupdate.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "Microsoft_AutoUpdate.*pkg" | sed -E 's/[a-zA-Z_]*_([0-9.]*)_.*/\1/g' | cut -d "." -f 1-2)
-    expectedTeamID="UBF8T346G9"
-    # commented the updatetool for MSAutoupdate, because when Autoupdate is really
-    # old or broken, you want to force a new install
-    #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    #updateToolArguments=( --install --apps MSau04 )
-    ;;
-microsoftcompanyportal)
-    name="Company Portal"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=869655"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.intunecompanyportal.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/CompanyPortal_.*pkg" | cut -d "_" -f 2 | cut -d "-" -f 1)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps IMCP01 )
-    ;;
-microsoftdefenderatp)
-    name="Microsoft Defender ATP"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=2097502"
-    appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.defender.standalone"]/version' 2>/dev/null | sed -E 's/<version>([0-9.]*) .*/\1/')
-    # No version number in download url
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps WDAV00 )
-    ;;
-microsoftedge|\
-microsoftedgeconsumerstable)
-    name="Microsoft Edge"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=2069148"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.edge"]/cfbundleversion' 2>/dev/null | sed -E 's/<cfbundleversion>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/MicrosoftEdge.*pkg" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps EDGE01 )
-    ;;
-microsoftedgeenterprisestable)
-    name="Microsoft Edge"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=2093438"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.edge"]/version' 2>/dev/null | sed -E 's/<version>([0-9.]*) .*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/MicrosoftEdge.*pkg" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps EDGE01 )
-    ;;
-microsoftexcel)
-    name="Microsoft Excel"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=525135"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.excel.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps XCEL2019 )
-    ;;
-microsoftlicenseremovaltool)
-    # credit: Isaac Ordonez (@isaac) macadmins slack
-    name="Microsoft License Removal Tool"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=849815"
-    expectedTeamID="QGS93ZLCU7"
-    appNewVersion=$(curl -is "$downloadURL" | grep ocation: | grep -o "Microsoft_.*pkg" | cut -d "_" -f 5 | cut -d "." -f1-2)
-    Company="Microsoft"
-    ;;
-microsoftoffice365)
-    name="MicrosoftOffice365"
-    type="pkg"
-    packageID="com.microsoft.pkg.licensing"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=525133"
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3)
-    expectedTeamID="UBF8T346G9"
-    # using MS PowerPoint as the 'stand-in' for the entire suite
-    #appName="Microsoft PowerPoint.app"
-    blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" )
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install )
-    ;;
-microsoftofficebusinesspro)
-    name="MicrosoftOfficeBusinessPro"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=2009112"
-    expectedTeamID="UBF8T346G9"
-    # using MS PowerPoint as the 'stand-in' for the entire suite
-    appName="Microsoft PowerPoint.app"
-    blockingProcesses=( "Microsoft AutoUpdate" "Microsoft Word" "Microsoft PowerPoint" "Microsoft Excel" "Microsoft OneNote" "Microsoft Outlook" "OneDrive" "Teams")
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install )
-    ;;
-microsoftonedrive)
-    name="OneDrive"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=823060"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.onedrive.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | cut -d "/" -f 6 | cut -d "." -f 1-3)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps ONDR18 )
-    ;;
-microsoftonenote)
-    name="Microsoft OneNote"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=820886"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.onenote.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps ONMC2019 )
-    ;;
-microsoftoutlook)
-    name="Microsoft Outlook"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=525137"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.outlook.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps OPIM2019 )
-    ;;
-microsoftpowerpoint)
-    name="Microsoft PowerPoint"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=525136"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.powerpoint.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps PPT32019 )
-    ;;
-microsoftremotedesktop)
-    name="Microsoft Remote Desktop"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=868963"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.remotedesktop.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_Remote_Desktop.*pkg" | cut -d "_" -f 4)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps MSRD10 )
-    ;;
-microsoftsharepointplugin)
-    # Microsoft has marked this "oldpackage", should probably not be used anymore
-    name="MicrosoftSharePointPlugin"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=800050"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/oldpackage[id="com.microsoft.sharepointplugin.standalone"]/version' 2>/dev/null | sed -E 's/<version>([0-9.]*) .*/\1/')
-    expectedTeamID="UBF8T346G9"
-    # TODO: determine blockingProcesses for SharePointPlugin
-    ;;
-microsoftskypeforbusiness)
-    name="Skype for Business"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=832978"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.skypeforbusiness.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps MSFB16 )
-    ;;
-microsoftteams)
-    name="Microsoft Teams"
-    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/<version>([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.
-    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 )
-    ;;
-microsoftvisualstudiocode|\
-visualstudiocode)
-    name="Visual Studio Code"
-    type="zip"
-    #downloadURL="https://go.microsoft.com/fwlink/?LinkID=620882" # Intel only
-    downloadURL="https://go.microsoft.com/fwlink/?LinkID=2156837" # Universal
-    appNewVersion=$(curl -fsL "https://code.visualstudio.com/Updates" | grep "/darwin" | grep -oiE ".com/([^>]+)([^<]+)/darwin" | cut -d "/" -f 2 | sed $'s/[^[:print:]\t]//g' | head -1 )
-    expectedTeamID="UBF8T346G9"
-    appName="Visual Studio Code.app"
-    blockingProcesses=( Code )
-    ;;
-microsoftword)
-    name="Microsoft Word"
-    type="pkg"
-    downloadURL="https://go.microsoft.com/fwlink/?linkid=525134"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/package[id="com.microsoft.word.standalone.365"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | grep -o "/Microsoft_.*pkg" | cut -d "_" -f 3 | cut -d "." -f 1-2)
-    expectedTeamID="UBF8T346G9"
-    updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    updateToolArguments=( --install --apps MSWD2019 )
-    ;;
-microsoftyammer)
-    name="Yammer"
-    type="dmg"
-    downloadURL="https://aka.ms/yammer_desktop_mac"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/oldpackage[id="com.microsoft.yammer.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
-    expectedTeamID="UBF8T346G9"
-    #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    #updateToolArguments=( --install --apps ?????? )
-    ;;
-
-# this description is so you can provide all variables as arguments
-# it will only check if the required variables are setting
-valuesfromarguments)
-    if [[ -z $name ]]; then
-        printlog "need to provide 'name'"
-        exit 1
-    fi
-    if [[ -z $type ]]; then
-        printlog "need to provide 'type'"
-        exit 1
-    fi
-    if [[ -z $downloadURL ]]; then
-        printlog "need to provide 'downloadURL'"
-        exit 1
-    fi
-    if [[ -z $expectedTeamID ]]; then
-        printlog "need to provide 'expectedTeamID'"
-        exit 1
-    fi
-    ;;
-
-# these descriptions exist for testing and are intentionally broken
-brokendownloadurl)
-    name="Google Chrome"
-    type="dmg"
-    downloadURL="https://broken.com/broken.dmg"
-    expectedTeamID="EQHXZ8M8AV"
-    ;;
-brokenappname)
-    name="brokenapp"
-    type="dmg"
-    downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
-    expectedTeamID="EQHXZ8M8AV"
-    ;;
-brokenteamid)
-    name="Google Chrome"
-    type="dmg"
-    downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
-    expectedTeamID="broken"
-    ;;
+zulujdk8)
+     name="Zulu JDK 8"
+     type="pkgInDmg"
+     packageID="com.azulsystems.zulu.8"
+     if [[ $(arch) == i386 ]]; then
+       downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu8.*ca-jdk8.*x64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
+     elif [[ $(arch) == arm64 ]]; then
+       downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu8.*ca-jdk8.*aarch64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
+     fi
+     expectedTeamID="TDTHCUPYFR"
+     appCustomVersion(){ if [ -f "/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Info.plist" ]; then /usr/bin/defaults read "/Library/Java/JavaVirtualMachines/zulu-8.jdk/Contents/Info.plist" "CFBundleName" | sed 's/Zulu //'; fi }
+     appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
+     ;;
 *)
    # unknown label
    #printlog "unknown label $label"
--- a/Labels.txt
+++ b/Labels.txt
@@ -24,6 +24,7 @@ applesfmono
 applesfpro
 aquaskk
 arq7
+asana
 atext
 atom
 audacity
@@ -42,7 +43,8 @@ bitwarden
 blender
 bluejeans
 boxdrive
-brave
+boxtools
+caffeine
 cakebrew
 calibre
 camostudio
@@ -52,7 +54,7 @@ clevershare2
 clickshare
 code42
 coderunner
-cormorant
+colourcontrastanalyser
 cryptomator
 cyberduck
 dangerzone
@@ -125,7 +127,7 @@ jamfconnect
 jamfmigrator
 jamfpppcutility
 jamfreenroller
-jetbrainsintellijidea
+jetbrainsdatagrip
 jetbrainsintellijideace
 jetbrainsphpstorm
 jetbrainspycharm
@@ -134,7 +136,6 @@ karabinerelements
 keepassxc
 keka
 keyboardmaestro
-keyboardmaestro
 klokki
 knockknock
 krisp
@@ -200,7 +201,7 @@ pacifist
 pdfsam
 pitch
 plantronicshub
-plisteditpro
+platypus
 postman
 prism9
 privileges
@@ -225,8 +226,8 @@ rocketchat
 royaltsx
 rstudio
 santa
-screamingfrogseospider
-screenflick
+scaleft
+screencloudplayer
 sfsymbols
 shield
 sidekick
@@ -285,6 +286,7 @@ vscodium
 webex
 webexmeetings
 webexteams
+webexteams
 whatsapp
 wickrme
 wickrpro
@@ -297,6 +299,8 @@ yubikeymanagerqt
 zappy
 zoom
 zoomclient
+zoomrooms
 zulujdk11
 zulujdk13
 zulujdk15
+zulujdk8
--- a/assemble.sh
+++ b/assemble.sh
@@ -0,0 +1 @@
+utils/assemble.sh
--- a/buildInstallomatorPkg.sh
+++ b/buildInstallomatorPkg.sh
@@ -1,72 +0,0 @@
-#!/bin/zsh
-
-# buildInstallomatorPkg.sh
-
-# this script will create a pkg installer that places the Installomator.sh
-# script file in /usr/local/Installomator/Installomator.sh
-
-# this is for use with MDM systems that require the tools to be local
-
-export PATH=/usr/bin:/bin:/usr/sbin:/sbin
-
-pkgname="Installomator"
-version="0.6"
-identifier="com.scriptingosx.${pkgname}"
-install_location="/usr/local/Installomator/"
-signature="Developer ID Installer: Armin Briegel (JME5BW3F3R)"
-dev_team="JME5BW3F3R" # asc-provider
-dev_account="developer@scriptingosx.com"
-dev_keychain_label="notary-scriptingosx"
-
-
-scriptfolder=$(dirname "$0")
-projectfolder=$(mktemp -d)
-payloadfolder="${projectfolder}/payload"
-
-
-# MARK: main code starts here
-
-# create a projectfolder with a payload folder
-if [[ ! -d "${payloadfolder}" ]]; then
-    mkdir -p "${payloadfolder}"
-fi
-
-# copy the script file
-cp ${scriptfolder}/Installomator.sh ${payloadfolder}
-chmod 755 ${payloadfolder}/Installomator.sh
-
-# set the DEBUG variable to 0
-sed -i '' -e 's/^DEBUG=1$/DEBUG=0/g' ${payloadfolder}/Installomator.sh
-
-# build the component package
-pkgpath="${scriptfolder}/${pkgname}.pkg"
-
-pkgbuild --root "${projectfolder}/payload" \
-         --identifier "${identifier}" \
-         --version "${version}" \
-         --install-location "${install_location}" \
-         "${pkgpath}"
-
-# build the product archive
-
-productpath="${scriptfolder}/${pkgname}-${version}.pkg"
-
-productbuild --package "${pkgpath}" \
-             --version "${version}" \
-             --identifier "${identifier}" \
-             --sign "${signature}" \
-             "${productpath}"
-
-# clean up project folder
-rm -Rf "${projectfolder}"
-
-# NOTE: notarytool requires Xcode 13
-
-# upload for notarization
-xcrun notarytool submit "$productpath" --keychain-profile "$dev_keychain_label" --wait
-
-# staple result
-echo "## Stapling $productpath"
-xcrun stapler staple "$productpath"
-
-exit 0
--- a/fragments/arguments.sh
+++ b/fragments/arguments.sh
@@ -0,0 +1,81 @@
+# MARK: check minimal macOS requirement
+autoload is-at-least
+
+if ! is-at-least 10.14 $(sw_vers -productVersion); then
+    printlog "Installomator requires at least macOS 10.14 Mojave."
+    exit 98
+fi
+
+# MARK: argument parsing
+if [[ $# -eq 0 ]]; then
+    if [[ -z $label ]]; then # check if label is set inside script
+        printlog "no label provided, printing labels"
+        grep -E '^[a-z0-9\_-]*(\)|\|\\)$' "$0" | tr -d ')|\' | grep -v -E '^(broken.*|longversion|version|valuesfromarguments)$' | sort
+        #grep -E '^[a-z0-9\_-]*(\)|\|\\)$' "${labelFile}" | tr -d ')|\' | grep -v -E '^(broken.*|longversion|version|valuesfromarguments)$' | sort
+        exit 0
+    fi
+elif [[ $1 == "/" ]]; then
+    # jamf uses sends '/' as the first argument
+    printlog "shifting arguments for Jamf"
+    shift 3
+fi
+
+while [[ -n $1 ]]; do
+    if [[ $1 =~ ".*\=.*" ]]; then
+        # if an argument contains an = character, send it to eval
+        printlog "setting variable from argument $1"
+        eval $1
+    else
+        # assume it's a label
+        label=$1
+    fi
+    # shift to next argument
+    shift 1
+done
+
+# lowercase the label
+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 }')
+
+
+# MARK: labels in case statement
+case $label in
+version)
+    # print the script VERSION
+    printlog "$VERSION"
+    exit 0
+    ;;
+longversion)
+    # print the script version
+    printlog "Installomater: version $VERSION ($VERSIONDATE)"
+    exit 0
+    ;;
+valuesfromarguments)
+    if [[ -z $name ]]; then
+        printlog "need to provide 'name'"
+        exit 1
+    fi
+    if [[ -z $type ]]; then
+        printlog "need to provide 'type'"
+        exit 1
+    fi
+    if [[ -z $downloadURL ]]; then
+        printlog "need to provide 'downloadURL'"
+        exit 1
+    fi
+    if [[ -z $expectedTeamID ]]; then
+        printlog "need to provide 'expectedTeamID'"
+        exit 1
+    fi
+    ;;
+
+# label descriptions start here
--- a/fragments/broken/brokenappname.sh
+++ b/fragments/broken/brokenappname.sh
@@ -0,0 +1,6 @@
+brokenappname)
+    name="brokenapp"
+    type="dmg"
+    downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
+    expectedTeamID="EQHXZ8M8AV"
+    ;;
--- a/fragments/broken/brokendownloadurl.sh
+++ b/fragments/broken/brokendownloadurl.sh
@@ -0,0 +1,6 @@
+brokendownloadurl)
+    name="Google Chrome"
+    type="dmg"
+    downloadURL="https://broken.com/broken.dmg"
+    expectedTeamID="EQHXZ8M8AV"
+    ;;
--- a/fragments/broken/brokenteamid.sh
+++ b/fragments/broken/brokenteamid.sh
@@ -0,0 +1,6 @@
+brokenteamid)
+    name="Google Chrome"
+    type="dmg"
+    downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
+    expectedTeamID="broken"
+    ;;
--- a/fragments/disabled/cdef.sh
+++ b/fragments/disabled/cdef.sh
@@ -0,0 +1,10 @@
+
+cdef)
+   # cdef currently not signed
+   # credit: Søren Theilgaard (@theilgaard)
+   name="cdef"
+   type="pkg"
+   downloadURL=$(downloadURLFromGit Shufflepuck cdef)
+   appNewVersion=$(versionFromGit Shufflepuck cdef)
+   #expectedTeamID="EM3ER8T33A"
+   ;;
--- a/fragments/disabled/fontforge.sh
+++ b/fragments/disabled/fontforge.sh
@@ -0,0 +1,10 @@
+
+fontforge)
+   # FontForge Not signed
+   # credit: Søren Theilgaard (@theilgaard)
+   name="FontForge"
+   type="dmg"
+   downloadURL=$(downloadURLFromGit fontforge fontforge)
+   appNewVersion=$(versionFromGit fontforge fontforge)
+   expectedTeamID=""
+   ;;
--- a/fragments/disabled/notifier.sh
+++ b/fragments/disabled/notifier.sh
@@ -0,0 +1,12 @@
+
+notifier)
+   # not signed
+   # credit: Søren Theilgaard (@theilgaard)
+   name="dataJAR Notifier"
+   type="pkg"
+   #packageID="uk.co.dataJAR.Notifier" # Version 2.2.3 was actually "uk.co.dataJAR.Notifier-2.2.3" so unusable
+   downloadURL=$(downloadURLFromGit dataJAR Notifier)
+   appNewVersion=$(versionFromGit dataJAR Notifier)
+   expectedTeamID=""
+   blockingProcesses=( "Notifier" )
+   ;;
--- a/fragments/disabled/packages.sh
+++ b/fragments/disabled/packages.sh
@@ -0,0 +1,9 @@
+
+packages)
+   #NOTE: Packages is signed but _not_ notarized, so spctl will reject it
+   name="Packages"
+   type="pkgInDmg"
+   pkgName="Install Packages.pkg"
+   downloadURL="http://s.sudre.free.fr/Software/files/Packages.dmg"
+   expectedTeamID="NL5M9E394P"
+   ;;
--- a/fragments/disabled/powershell-lts.sh
+++ b/fragments/disabled/powershell-lts.sh
@@ -0,0 +1,10 @@
+
+powershell-lts)
+    #NOTE: powershell installers are not notarized
+    # credit: Tadayuki Onishi (@kenchan0130)
+    name="PowerShell"
+    type="pkg"
+    downloadURL=$(curl -fs "https://api.github.com/repos/Powershell/Powershell/releases/latest" \
+    | awk -F '"' '/browser_download_url/ && /pkg/ { print $4 }' | grep lts)
+    expectedTeamID="UBF8T346G9"
+    ;;
--- a/fragments/disabled/powershell.sh
+++ b/fragments/disabled/powershell.sh
@@ -0,0 +1,10 @@
+
+powershell)
+    #NOTE: powershell installers are not notarized
+    # credit: Tadayuki Onishi (@kenchan0130)
+    name="PowerShell"
+    type="pkg"
+    downloadURL=$(curl -fs "https://api.github.com/repos/Powershell/Powershell/releases/latest" \
+    | awk -F '"' '/browser_download_url/ && /pkg/ { print $4 }' | grep -v lts )
+    expectedTeamID="UBF8T346G9"
+    ;;
--- a/fragments/disabled/vmwarefusion.sh
+++ b/fragments/disabled/vmwarefusion.sh
@@ -0,0 +1,10 @@
+
+vmwarefusion)
+    #TODO: vmwarefusion installation process needs testing
+    # credit: Erik Stam (@erikstam)
+    name="VMware Fusion"
+    type="dmg"
+    downloadURL="https://www.vmware.com/go/getfusion"
+    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*Fusion-([0-9.]*)-.*/\1/g' )
+    expectedTeamID="EG7KH642X6"
+    ;;
--- a/fragments/disabled/wordmat.sh
+++ b/fragments/disabled/wordmat.sh
@@ -0,0 +1,13 @@
+
+wordmat)
+   # WordMat currently not signed
+   # credit: Søren Theilgaard (@theilgaard)
+   name="WordMat"
+   type="pkg"
+   packageID="com.eduap.pkg.WordMat"
+   downloadURL=$(downloadURLFromGit Eduap-com WordMat)
+   #downloadURL=$(curl -fs "https://api.github.com/repos/Eduap-com/WordMat/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
+   appNewVersion=$(versionFromGit Eduap-com WordMat)
+   #curl -fs "https://api.github.com/repos/Eduap-com/WordMat/releases/latest" | grep tag_name | cut -d '"' -f 4 | sed 's/[^0-9\.]//g'
+   expectedTeamID=""
+   ;;
--- a/fragments/disabled/wwdcformac.sh
+++ b/fragments/disabled/wwdcformac.sh
@@ -0,0 +1,8 @@
+
+wwdcformac)
+   #this label looks like software/site is gone
+   name="WWDC"
+   type="zip"
+   downloadURL="https://cdn.wwdc.io/WWDC_latest.zip"
+   expectedTeamID="8C7439RJLG"
+   ;;
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -0,0 +1,609 @@
+# MARK: Functions
+
+cleanupAndExit() { # $1 = exit code, $2 message
+    if [[ -n $2 && $1 -ne 0 ]]; then
+        printlog "ERROR: $2"
+    fi
+    if [ "$DEBUG" -eq 0 ]; then
+        # remove the temporary working directory when done
+        printlog "Deleting $tmpDir"
+        rm -Rf "$tmpDir"
+    fi
+
+    if [ -n "$dmgmount" ]; then
+        # unmount disk image
+        printlog "Unmounting $dmgmount"
+        hdiutil detach "$dmgmount"
+    fi
+    # If we closed any processes, reopen the app again
+    reopenClosedProcess
+    printlog "################## End Installomator, exit code $1 \n\n"
+    exit "$1"
+}
+
+runAsUser() {
+    if [[ $currentUser != "loginwindow" ]]; then
+        uid=$(id -u "$currentUser")
+        launchctl asuser $uid sudo -u $currentUser "$@"
+    fi
+}
+
+reloadAsUser() {
+    if [[ $currentUser != "loginwindow" ]]; then
+        uid=$(id -u "$currentUser")
+        su - $currentUser -c "${@}"
+    fi
+}
+
+displaydialog() { # $1: message $2: title
+    message=${1:-"Message"}
+    title=${2:-"Installomator"}
+    runAsUser osascript -e "button returned of (display dialog \"$message\" with  title \"$title\" buttons {\"Not Now\", \"Quit and Update\"} default button \"Quit and Update\" with icon POSIX file \"$LOGO\")"
+}
+
+displaydialogContinue() { # $1: message $2: title
+    message=${1:-"Message"}
+    title=${2:-"Installomator"}
+    runAsUser osascript -e "button returned of (display dialog \"$message\" with  title \"$title\" buttons {\"Quit and Update\"} default button \"Quit and Update\" with icon POSIX file \"$LOGO\")"
+}
+
+displaynotification() { # $1: message $2: title
+    message=${1:-"Message"}
+    title=${2:-"Notification"}
+    manageaction="/Library/Application Support/JAMF/bin/Management Action.app/Contents/MacOS/Management Action"
+
+    if [[ -x "$manageaction" ]]; then
+         "$manageaction" -message "$message" -title "$title"
+    else
+        runAsUser osascript -e "display notification \"$message\" with title \"$title\""
+    fi
+}
+
+
+# MARK: Logging
+log_location="/private/var/log/Installomator.log"
+
+printlog(){
+
+    timestamp=$(date +%F\ %T)
+        
+    if [[ "$(whoami)" == "root" ]]; then
+        echo "$timestamp" "$label" "$1" | tee -a $log_location
+    else
+        echo "$timestamp" "$label" "$1"
+    fi
+}
+
+# will get the latest release download from a github repo
+downloadURLFromGit() { # $1 git user name, $2 git repo name
+    gitusername=${1?:"no git user name"}
+    gitreponame=${2?:"no git repo name"}
+    
+    if [[ $type == "pkgInDmg" ]]; then
+        filetype="dmg"
+    elif [[ $type == "pkgInZip" ]]; then
+        filetype="zip"
+    else
+        filetype=$type
+    fi
+    
+    if [ -n "$archiveName" ]; then
+    downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
+    | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }")
+    else
+    downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
+    | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    fi
+    if [ -z "$downloadURL" ]; then
+        cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame"
+        #exit 9
+    else
+        echo "$downloadURL"
+        return 0
+    fi
+}
+
+versionFromGit() {
+    # credit: Søren Theilgaard (@theilgaard)
+    # $1 git user name, $2 git repo name
+    gitusername=${1?:"no git user name"}
+    gitreponame=${2?:"no git repo name"}
+        
+    appNewVersion=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | grep tag_name | cut -d '"' -f 4 | sed 's/[^0-9\.]//g')
+    if [ -z "$appNewVersion" ]; then
+        printlog "could not retrieve version number for $gitusername/$gitreponame"
+        appNewVersion=""
+    else
+        echo "$appNewVersion"
+        return 0
+    fi
+}
+
+
+# Handling of differences in xpath between Catalina and Big Sur
+xpath() {
+	# the xpath tool changes in Big Sur and now requires the `-e` option	
+	if [[ $(sw_vers -buildVersion) > "20A" ]]; then
+		/usr/bin/xpath -e $@
+		# alternative: switch to xmllint (which is not perl)
+		#xmllint --xpath $@ -
+	else
+		/usr/bin/xpath $@
+	fi
+}
+
+
+getAppVersion() {
+    # 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')"
+        if [[ $appversion != "" ]]; then
+            printlog "found packageID $packageID installed, version $appversion"
+            return
+        else
+            printlog "No version found using packageID $packageID"
+        fi
+    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
+        filteredAppPaths=( ${(M)appPathArray:#${targetDir}*} )
+        if [[ ${#filteredAppPaths} -eq 1 ]]; then
+            installedAppPath=$filteredAppPaths[1]
+            #appversion=$(mdls -name kMDItemVersion -raw $installedAppPath )
+            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"
+        fi
+    else
+        printlog "could not find $appName"
+    fi
+}
+
+checkRunningProcesses() {
+    # don't check in DEBUG mode
+    if [[ $DEBUG -ne 0 ]]; then
+        printlog "DEBUG mode, not checking for blocking processes"
+        return
+    fi
+
+    # try at most 3 times
+    for i in {1..4}; do
+        countedProcesses=0
+        for x in ${blockingProcesses}; do
+            if pgrep -xq "$x"; then
+                printlog "found blocking process $x"
+                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
+                      sleep 5
+                      ;;
+                    prompt_user|prompt_user_then_kill)
+                      button=$(displaydialog "Quit “$x” to continue updating? (Leave this dialogue if you want to activate this update later)." "The application “$x” needs to be updated.")
+                      if [[ $button = "Not Now" ]]; then
+                        cleanupAndExit 10 "user aborted update"
+                      else
+                        if [[ $i > 2 && $BLOCKING_PROCESS_ACTION = "prompt_user_then_kill" ]]; then
+                          printlog "Changing BLOCKING_PROCESS_ACTION to kill"
+                          BLOCKING_PROCESS_ACTION=kill
+                        else
+                          printlog "telling app $x to quit"
+                          runAsUser osascript -e "tell app \"$x\" to quit"
+                          # give the user a bit of time to quit apps
+                          printlog "waiting 30 seconds for processes to quit"
+                          sleep 30
+                        fi
+                      fi
+                      ;;
+                    prompt_user_loop)
+                      button=$(displaydialog "Quit “$x” to continue updating? (Click “Not Now” to be asked in 1 hour, or leave this open until you are ready)." "The application “$x” needs to be updated.")
+                      if [[ $button = "Not Now" ]]; then
+                        if [[ $i < 2 ]]; then
+                          printlog "user wants to wait an hour"
+                          sleep 3600 # 3600 seconds is an hour
+                        else
+                          printlog "change of BLOCKING_PROCESS_ACTION to tell_user"
+                          BLOCKING_PROCESS_ACTION=tell_user
+                        fi
+                      else
+                        printlog "telling app $x to quit"
+                        runAsUser osascript -e "tell app \"$x\" to quit"
+                        # give the user a bit of time to quit apps
+                        printlog "waiting 30 seconds for processes to quit"
+                        sleep 30
+                      fi
+                      ;;
+                    tell_user|tell_user_then_kill)
+                      button=$(displaydialogContinue "Quit “$x” to continue updating? (This is an important update). Wait for notification of update before launching app again." "The application “$x” needs to be updated.")
+                      printlog "telling app $x to quit"
+                      runAsUser osascript -e "tell app \"$x\" to quit"
+                      # give the user a bit of time to quit apps
+                      printlog "waiting 30 seconds for processes to quit"
+                      sleep 30
+                      if [[ $i > 1 && $BLOCKING_PROCESS_ACTION = tell_user_then_kill ]]; then
+                          printlog "Changing BLOCKING_PROCESS_ACTION to kill"
+                          BLOCKING_PROCESS_ACTION=kill
+                      fi
+                      ;;
+                    silent_fail)
+                      cleanupAndExit 12 "blocking process '$x' found, aborting"
+                      ;;
+                esac
+
+                countedProcesses=$((countedProcesses + 1))
+            fi
+        done
+
+    done
+
+    if [[ $countedProcesses -ne 0 ]]; then
+        cleanupAndExit 11 "could not quit all processes, aborting..."
+    fi
+
+    printlog "no more blocking processes, continue with update"
+}
+
+reopenClosedProcess() {
+    # If Installomator closed any processes, let's get the app opened again
+    # credit: Søren Theilgaard (@theilgaard)
+    
+    # don't reopen if REOPEN is not "yes"
+    if [[ $REOPEN != yes ]]; then
+        printlog "REOPEN=no, not reopening anything"
+        return
+    fi
+
+    # don't reopen in DEBUG mode
+    if [[ $DEBUG -ne 0 ]]; then
+        printlog "DEBUG mode, not reopening anything"
+        return
+    fi
+    
+    if [[ $appClosed == 1 ]]; then
+        printlog "Telling app $appName to open"
+        #runAsUser osascript -e "tell app \"$appName\" to open"
+        #runAsUser open -a "${appName}"
+        reloadAsUser "open -a \"${appName}\""
+        #reloadAsUser "open \"${(0)applist}\""
+        processuser=$(ps aux | grep -i "${appName}" | grep -vi "grep" | awk '{print $1}')
+        printlog "Reopened ${appName} as $processuser"
+    else
+        printlog "App not closed, so no reopen."
+    fi
+}
+
+installAppWithPath() { # $1: path to app to install in $targetDir
+    # modified by: Søren Theilgaard (@theilgaard)
+    appPath=${1?:"no path to app"}
+
+    # check if app exists
+    if [ ! -e "$appPath" ]; then
+        cleanupAndExit 8 "could not find: $appPath"
+    fi
+
+    # verify with spctl
+    printlog "Verifying: $appPath"
+    if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
+        cleanupAndExit 4 "Error verifying $appPath"
+    fi
+
+    printlog "Team ID matching: $teamID (expected: $expectedTeamID )"
+
+    if [ "$expectedTeamID" != "$teamID" ]; then
+        cleanupAndExit 5 "Team IDs do not match"
+    fi
+
+    # versioncheck
+    # credit: Søren Theilgaard (@theilgaard)
+    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
+            message="$name, version $appNewVersion, is  the latest version."
+            if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
+                printlog "notifying"
+                displaynotification "$message" "No update for $name!"
+            fi
+            cleanupAndExit 0 "No new version to install"
+        else
+            printlog "Using force to install anyway."
+        fi
+    else
+        printlog "Downloaded version of $name is $appNewVersion (replacing version $appversion)."
+    fi
+
+    # skip install for DEBUG
+    if [ "$DEBUG" -ne 0 ]; then
+        printlog "DEBUG enabled, skipping remove, copy and chown steps"
+        return 0
+    fi
+
+    # check for root
+    if [ "$(whoami)" != "root" ]; then
+        # not running as root
+        cleanupAndExit 6 "not running as root, exiting"
+    fi
+
+    # remove existing application
+    if [ -e "$targetDir/$appName" ]; then
+        printlog "Removing existing $targetDir/$appName"
+        rm -Rf "$targetDir/$appName"
+    fi
+
+    # copy app to /Applications
+    printlog "Copy $appPath to $targetDir"
+    if ! ditto "$appPath" "$targetDir/$appName"; then
+        cleanupAndExit 7 "Error while copying"
+    fi
+
+
+    # set ownership to current user
+    if [ "$currentUser" != "loginwindow" ]; then
+        printlog "Changing owner to $currentUser"
+        chown -R "$currentUser" "$targetDir/$appName"
+    else
+        printlog "No user logged in, not changing user"
+    fi
+
+}
+
+mountDMG() {
+    # mount the dmg
+    printlog "Mounting $tmpDir/$archiveName"
+    # always pipe 'Y\n' in case the dmg requires an agreement
+    if ! dmgmount=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
+        cleanupAndExit 3 "Error mounting $tmpDir/$archiveName"
+    fi
+
+    if [[ ! -e $dmgmount ]]; then
+        printlog "Error mounting $tmpDir/$archiveName"
+        cleanupAndExit 3
+    fi
+
+    printlog "Mounted: $dmgmount"
+}
+
+installFromDMG() {
+    mountDMG
+
+    installAppWithPath "$dmgmount/$appName"
+}
+
+installFromPKG() {
+    # verify with spctl
+    printlog "Verifying: $archiveName"
+    
+    if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then
+        printlog "Error verifying $archiveName"
+        cleanupAndExit 4
+    fi
+    
+    teamID=$(echo $spctlout | awk -F '(' '/origin=/ {print $2 }' | tr -d '()' )
+
+    # Apple signed software has no teamID, grab entire origin instead
+    if [[ -z $teamID ]]; then
+        teamID=$(echo $spctlout | awk -F '=' '/origin=/ {print $NF }')
+    fi
+
+
+    printlog "Team ID: $teamID (expected: $expectedTeamID )"
+
+    if [ "$expectedTeamID" != "$teamID" ]; then
+        printlog "Team IDs do not match!"
+        cleanupAndExit 5
+    fi
+
+    # Check version of pkg to be installed if packageID is set
+    if [[ $packageID != "" && $appversion != "" ]]; then
+        printlog "Checking package version."
+        pkgutil --expand "$archiveName" "$archiveName"_pkg
+        #printlog "$(cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null)"
+        appNewVersion=$(cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null | grep -i "$packageID" | tr ' ' '\n' | grep -i version | cut -d \" -f 2) #sed -E 's/.*\"([0-9.]*)\".*/\1/g'
+        rm -r "$archiveName"_pkg
+        printlog "Downloaded package $packageID version $appNewVersion"
+        if [[ $appversion == $appNewVersion ]]; then
+            printlog "Downloaded version of $name is the same as installed."
+            if [[ $INSTALL != "force" ]]; then
+                message="$name, version $appNewVersion, is  the latest version."
+                if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
+                    printlog "notifying"
+                    displaynotification "$message" "No update for $name!"
+                fi
+                cleanupAndExit 0 "No new version to install"
+            else
+                printlog "Using force to install anyway."
+            fi
+        fi
+    fi
+    
+    # skip install for DEBUG
+    if [ "$DEBUG" -ne 0 ]; then
+        printlog "DEBUG enabled, skipping installation"
+        return 0
+    fi
+
+    # check for root
+    if [ "$(whoami)" != "root" ]; then
+        # not running as root
+        cleanupAndExit 6 "not running as root, exiting"
+    fi
+
+    # install pkg
+    printlog "Installing $archiveName to $targetDir"
+    if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
+        printlog "error installing $archiveName"
+        cleanupAndExit 9
+    fi
+}
+
+installFromZIP() {
+    # unzip the archive
+    printlog "Unzipping $archiveName"
+    
+    # tar -xf "$archiveName"
+
+    # note: when you expand a zip using tar in Mojave the expanded
+    # app will never pass the spctl check
+
+    # unzip -o -qq "$archiveName"
+    
+    # note: githubdesktop fails spctl verification when expanded
+    # with unzip
+    
+    ditto -x -k "$archiveName" "$tmpDir"
+    installAppWithPath "$tmpDir/$appName"
+}
+
+installFromTBZ() {
+    # unzip the archive
+    printlog "Unzipping $archiveName"
+    tar -xf "$archiveName"
+    installAppWithPath "$tmpDir/$appName"
+}
+
+installPkgInDmg() {
+    mountDMG
+    # locate pkg in dmg
+    if [[ -z $pkgName ]]; then
+        # find first file ending with 'pkg'
+        findfiles=$(find "$dmgmount" -iname "*.pkg" -maxdepth 1  )
+        filearray=( ${(f)findfiles} )
+        if [[ ${#filearray} -eq 0 ]]; then
+            cleanupAndExit 20 "couldn't find pkg in dmg $archiveName"
+        fi
+        archiveName="${filearray[1]}"
+        printlog "found pkg: $archiveName"
+    else
+        # it is now safe to overwrite archiveName for installFromPKG
+        archiveName="$dmgmount/$pkgName"
+    fi
+
+    # installFromPkgs
+    installFromPKG
+}
+
+installPkgInZip() {
+    # unzip the archive
+    printlog "Unzipping $archiveName"
+    tar -xf "$archiveName"
+
+    # locate pkg in zip
+    if [[ -z $pkgName ]]; then
+        # find first file ending with 'pkg'
+        findfiles=$(find "$tmpDir" -iname "*.pkg" -maxdepth 2  )
+        filearray=( ${(f)findfiles} )
+        if [[ ${#filearray} -eq 0 ]]; then
+            cleanupAndExit 20 "couldn't find pkg in zip $archiveName"
+        fi
+        archiveName="${filearray[1]}"
+        # it is now safe to overwrite archiveName for installFromPKG
+        printlog "found pkg: $archiveName"
+    else
+        # it is now safe to overwrite archiveName for installFromPKG
+        archiveName="$tmpDir/$pkgName"
+    fi
+
+    # installFromPkgs
+    installFromPKG
+}
+
+installAppInDmgInZip() {
+    # unzip the archive
+    printlog "Unzipping $archiveName"
+    tar -xf "$archiveName"
+
+    # locate dmg in zip
+    if [[ -z $pkgName ]]; then
+        # find first file ending with 'dmg'
+        findfiles=$(find "$tmpDir" -iname "*.dmg" -maxdepth 2  )
+        filearray=( ${(f)findfiles} )
+        if [[ ${#filearray} -eq 0 ]]; then
+            cleanupAndExit 20 "couldn't find dmg in zip $archiveName"
+        fi
+        archiveName="$(basename ${filearray[1]})"
+        # it is now safe to overwrite archiveName for installFromDMG
+        printlog "found dmg: $tmpDir/$archiveName"
+    else
+        # it is now safe to overwrite archiveName for installFromDMG
+        archiveName="$pkgName"
+    fi
+
+    # installFromDMG, DMG expected to include an app (will not work with pkg)
+    installFromDMG
+}
+
+runUpdateTool() {
+    printlog "Function called: runUpdateTool"
+    if [[ -x $updateTool ]]; then
+        printlog "running $updateTool $updateToolArguments"
+        if [[ -n $updateToolRunAsCurrentUser ]]; then
+            runAsUser $updateTool ${updateToolArguments}
+        else
+            $updateTool ${updateToolArguments}
+        fi
+        if [[ $? -ne 0 ]]; then
+            cleanupAndExit 15 "Error running $updateTool"
+        fi
+    else
+        printlog "couldn't find $updateTool, continuing normally"
+        return 1
+    fi
+    return 0
+}
+
+finishing() {
+    printlog "Finishing…"
+    sleep 10 # wait a moment to let spotlight catch up
+    getAppVersion
+
+    if [[ -z $appversion ]]; then
+        message="Installed $name"
+    else
+        message="Installed $name, version $appversion"
+    fi
+
+    printlog "$message"
+
+    if [[ $currentUser != "loginwindow" && ( $NOTIFY == "success" || $NOTIFY == "all" ) ]]; then
+        printlog "notifying"
+        displaynotification "$message" "$name update/installation complete!"
+    fi
+}
+
+
--- a/fragments/header.sh
+++ b/fragments/header.sh
@@ -0,0 +1,187 @@
+#!/bin/zsh
+label="" # if no label is sent to the script, this will be used
+
+# Installomator
+#
+# Downloads and installs Applications
+# 2020-2021 Installomator
+#
+# inspired by the download scripts from William Smith and Sander Schram
+# 
+# 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
+
+# NOTE: adjust these variables:
+
+# set to 0 for production, 1 for debugging
+# while debugging, items will be downloaded to the parent directory of this script
+# also no actual installation will be performed
+DEBUG=1
+
+# notify behavior
+NOTIFY=success
+# options:
+#   - success      notify the user on success
+#   - silent       no notifications
+#   - all          all notifications (great for Self Service installation)
+
+
+# behavior when blocking processes are found
+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
+#                  (only if user accepts to quit the apps, otherwise
+#                  the update is cancelled).
+#   - prompt_user_then_kill
+#                  show a user dialog for each blocking process found,
+#                  attempt to quit two times, kill the process finally
+#   - prompt_user_loop
+#                  Like prompt-user, but clicking "Not Now", will just wait an hour,
+#                  and then it will ask again.
+#   - tell_user    User will be showed a notification about the important update,
+#                  but user is only allowed to quit and continue, and then we
+#                  ask the app to quit.
+#   - tell_user_then_kill
+#                  Show dialog 2 times, and if the quitting fails, the
+#                  blocking processes will be killed.
+#   - kill         kill process without prompting or giving the user a chance to save
+
+
+# logo-icon used in dialog boxes if app is blocking
+LOGO=appstore
+# options:
+#   - appstore      Icon is Apple App Store (default)
+#   - 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).
+
+
+# install behavior
+INSTALL=""
+# options:
+#  -               When not set, software will only be installed
+#                  if it is newer/different in version
+#  - force         Install even if it’s the same version
+
+
+# Re-opening of closed app
+REOPEN="yes"
+# options:
+#  - yes           App wil be reopened if it was closed
+#  - no            App not reopened
+
+
+# NOTE: How labels work
+
+# Each workflow label needs to be listed in the case statement below.
+# for each label these variables can be set:
+#
+# - name: (required)
+#   Name of the installed app.
+#   This is used to derive many of the other variables.
+#
+# - type: (required)
+#   The type of the installation. Possible values:
+#     - dmg
+#     - pkg
+#     - zip
+#     - tbz
+#     - pkgInDmg
+#     - pkgInZip
+#     - appInDmgInZip
+#     - updateronly     This last one is for labels that should only run an updateTool (see below)
+#
+# - packageID: (optional)
+#   The package ID of a pkg
+#   If given, will be used to find version of installed software, instead of searching for an app.
+#   Usefull if a pkg does not install an app.
+#   See label installomator_st
+#
+# - downloadURL: (required)
+#   URL to download the dmg.
+#   Can be generated with a series of commands (see BBEdit for an example).
+#
+# - appNewVersion: (optional)
+#   Version of the downloaded software.
+#   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:
+#
+#   - Applications (in dmgs or zips)
+#     spctl -a -vv /Applications/BBEdit.app
+#
+#   - Pkgs
+#     spctl -a -vv -t install ~/Downloads/desktoppr-0.2.pkg
+#
+#   The team ID is the ten-digit ID at the end of the line starting with 'origin='
+#
+# - archiveName: (optional)
+#   The name of the downloaded file.
+#   When not given the archiveName is derived from the $name.
+#
+# - appName: (optional)
+#   File name of the app bundle in the dmg to verify and copy (include .app).
+#   When not given, the appName is derived from the $name.
+#
+# - targetDir: (optional)
+#   dmg or zip:
+#     Applications will be copied to this directory.
+#     Default value is '/Applications' for dmg and zip installations.
+#   pkg:
+#     targetDir is used as the install-location. Default is '/'.
+#
+# - blockingProcesses: (optional)
+#   Array of process names that will block the installation or update.
+#   If no blockingProcesses array is given the default will be:
+#     blockingProcesses=( $name )
+#   When a package contains multiple applications, _all_ should be listed, e.g:
+#     blockingProcesses=( "Keynote" "Pages" "Numbers" )
+#   When a workflow has no blocking processes, use
+#     blockingProcesses=( NONE )
+#
+# - pkgName: (optional, only used for pkgInDmg, dmgInZip, and appInDmgInZip)
+#   File name of the pkg/dmg file _inside_ the dmg or zip
+#   When not given the pkgName is derived from the $name
+#
+# - updateTool:
+# - updateToolArguments:
+#   When Installomator detects an existing installation of the application,
+#   and the updateTool variable is set
+#      $updateTool $updateArguments
+#   Will be run instead of of downloading and installing a complete new version.
+#   Use this when the updateTool does differential and optimized downloads.
+#   e.g. msupdate
+#
+# - updateToolRunAsCurrentUser:
+#   When this variable is set (any value), $updateTool will be run as the current user.
+#
--- a/fragments/labels/1password7.sh
+++ b/fragments/labels/1password7.sh
@@ -0,0 +1,9 @@
+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.sh
+++ b/fragments/labels/4kvideodownloader.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/8x8.sh
@@ -0,0 +1,9 @@
+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.sh
+++ b/fragments/labels/abstract.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/adobebrackets.sh
@@ -0,0 +1,7 @@
+adobebrackets)
+    name="Brackets"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit adobe brackets )
+    appNewVersion=$(versionFromGit adobe brackets )
+    expectedTeamID="JQ525L2MZD"
+    ;;
--- a/fragments/labels/adobeconnect.sh
+++ b/fragments/labels/adobeconnect.sh
@@ -0,0 +1,10 @@
+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.sh
+++ b/fragments/labels/adobereaderdc-update.sh
@@ -0,0 +1,9 @@
+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.sh
+++ b/fragments/labels/adobereaderdc.sh
@@ -0,0 +1,11 @@
+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.sh
+++ b/fragments/labels/aircall.sh
@@ -0,0 +1,7 @@
+aircall)
+    # credit: @kris-anderson
+    name="Aircall"
+    type="dmg"
+    downloadURL="https://electron.aircall.io/download/osx"
+    expectedTeamID="3ML357Q795"
+    ;;
--- a/fragments/labels/airserver.sh
+++ b/fragments/labels/airserver.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/aldente.sh
@@ -0,0 +1,7 @@
+aldente)
+    name="AlDente"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit davidwernhart AlDente)
+    appNewVersion=$(versionFromGit davidwernhart AlDente)
+    expectedTeamID="3WVC84GB99"
+    ;;
--- a/fragments/labels/alfred.sh
+++ b/fragments/labels/alfred.sh
@@ -0,0 +1,9 @@
+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.sh
+++ b/fragments/labels/alttab.sh
@@ -0,0 +1,7 @@
+alttab)
+    # credit: Gabe Marchan (gabemarchan.com - @darklink87)
+    name="AltTab"
+    type="zip"
+    downloadURL=$(downloadURLFromGit lwouis alt-tab-macos)
+    expectedTeamID="QXD7GW8FHY"
+    ;;
--- a/fragments/labels/amazonchime.sh
+++ b/fragments/labels/amazonchime.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/amazonworkspaces.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/androidfiletransfer.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/anydesk.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/apparency.sh
@@ -0,0 +1,6 @@
+apparency)
+    name="Apparency"
+    type="dmg"
+    downloadURL="https://www.mothersruin.com/software/downloads/Apparency.dmg"
+    expectedTeamID="936EB786NH"
+    ;;
--- a/fragments/labels/appcleaner.sh
+++ b/fragments/labels/appcleaner.sh
@@ -0,0 +1,7 @@
+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 " " "\n" | sort | tail -1 | cut -d '"' -f 2)
+    expectedTeamID="X85ZX835W9"
+    ;;
--- a/fragments/labels/applenyfonts.sh
+++ b/fragments/labels/applenyfonts.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/applesfcompact.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/applesfmono.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/applesfpro.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/aquaskk.sh
@@ -0,0 +1,8 @@
+aquaskk)
+    # credit: Tadayuki Onishi (@kenchan0130)
+    name="aquaskk"
+    type="pkg"
+    downloadURL=$(downloadURLFromGit codefirst aquaskk)
+    appNewVersion=$(versionFromGit codefirst aquaskk)
+    expectedTeamID="FPZK4WRGW7"
+    ;;
--- a/fragments/labels/arq7.sh
+++ b/fragments/labels/arq7.sh
@@ -0,0 +1,8 @@
+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/asana.sh
+++ b/fragments/labels/asana.sh
@@ -0,0 +1,7 @@
+asana)
+     # credit: Lance Stephens (@pythoninthegrass on MacAdmins Slack)
+     name="Asana"
+     type="dmg"
+     downloadURL="https://desktop-downloads.asana.com/darwin_x64/prod/latest/Asana.dmg"
+     expectedTeamID="A679L395M8"
+     ;;
--- a/fragments/labels/atext.sh
+++ b/fragments/labels/atext.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/atom.sh
@@ -0,0 +1,8 @@
+atom)
+    name="Atom"
+    type="zip"
+    archiveName="atom-mac.zip"
+    downloadURL=$(downloadURLFromGit atom atom )
+    appNewVersion=$(versionFromGit atom atom)
+    expectedTeamID="VEKTX9H2N7"
+    ;;
--- a/fragments/labels/audacity.sh
+++ b/fragments/labels/audacity.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/autodmg.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/autopkgr.sh
@@ -0,0 +1,9 @@
+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.sh
+++ b/fragments/labels/aviatrix.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/awscli2.sh
@@ -0,0 +1,9 @@
+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.sh
+++ b/fragments/labels/awsvpnclient.sh
@@ -0,0 +1,7 @@
+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 ',' '\n' | grep currentVersion | cut -d '"' -f 4)
+    ;;
--- a/fragments/labels/balenaetcher.sh
+++ b/fragments/labels/balenaetcher.sh
@@ -0,0 +1,7 @@
+balenaetcher)
+    name="balenaEtcher"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit balena-io etcher )
+    appNewVersion=$(versionFromGit balena-io etcher )
+    expectedTeamID="66H43P8FRG"
+    ;;
--- a/fragments/labels/balsamiqwireframes.sh
+++ b/fragments/labels/balsamiqwireframes.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/bartender.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/basecamp3.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/bbedit.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/bettertouchtool.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/bitwarden.sh
@@ -0,0 +1,7 @@
+bitwarden)
+    name="Bitwarden"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit bitwarden desktop )
+    appNewVersion=$(versionFromGit bitwarden desktop )
+    expectedTeamID="LTZ2PFU5D6"
+    ;;
--- a/fragments/labels/blender.sh
+++ b/fragments/labels/blender.sh
@@ -0,0 +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)
+    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
+    expectedTeamID="68UA947AUU"
+    ;;
--- a/fragments/labels/bluejeans.sh
+++ b/fragments/labels/bluejeans.sh
@@ -0,0 +1,11 @@
+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.sh
+++ b/fragments/labels/boxdrive.sh
@@ -0,0 +1,12 @@
+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/boxtools.sh
+++ b/fragments/labels/boxtools.sh
@@ -0,0 +1,6 @@
+boxtools)
+     name="Box Tools"
+     type="pkg"
+     downloadURL="https://box-installers.s3.amazonaws.com/boxedit/mac/currentrelease/BoxToolsInstaller.pkg"
+     expectedTeamID="M683GB7CPW"
+     ;;
--- a/fragments/labels/brave.sh
+++ b/fragments/labels/brave.sh
@@ -0,0 +1,15 @@
+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 '\r\n')
+    else
+        printlog "Architecture: i386"
+        downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osx/release | grep -i "^location" | awk '{print $2}' | tr -d '\r\n')
+    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/caffeine.sh
+++ b/fragments/labels/caffeine.sh
@@ -0,0 +1,8 @@
+caffeine)
+    name="Caffeine"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit IntelliScape caffeine)
+    appNewVersion=$(versionFromGit IntelliScape caffeine)
+    expectedTeamID="YD6LEYT6WZ"
+    blockingProcesses=( Caffeine )
+    ;;
--- a/fragments/labels/cakebrew.sh
+++ b/fragments/labels/cakebrew.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/calibre.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/camostudio.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/camtasia.sh
@@ -0,0 +1,6 @@
+camtasia)
+    name="Camtasia 2020"
+    type="dmg"
+    downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg
+    expectedTeamID="7TQL462TU8"
+    ;;
--- a/fragments/labels/citrixworkspace.sh
+++ b/fragments/labels/citrixworkspace.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/clevershare2.sh
@@ -0,0 +1,8 @@
+clevershare2)
+    # credit: Søren Theilgaard (@theilgaard)
+    name="Clevershare"
+    type="dmg"
+    downloadURL=$(curl -fs https://archive.clevertouch.com/clevershare2g | grep -i "_Mac" | tr '"' "\n" | 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.sh
+++ b/fragments/labels/clickshare.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/code42.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/coderunner.sh
@@ -0,0 +1,7 @@
+coderunner)
+    # credit: Erik Stam (@erikstam)
+    name="CodeRunner"
+    type="zip"
+    downloadURL="https://coderunnerapp.com/download"
+    expectedTeamID="R4GD98AJF9"
+    ;;
--- a/fragments/labels/colourcontrastanalyser.sh
+++ b/fragments/labels/colourcontrastanalyser.sh
@@ -0,0 +1,8 @@
+colourcontrastanalyser)
+     name="Colour Contrast Analyser (CCA)"
+     type="dmg"
+     downloadURL=$(downloadURLFromGit ThePacielloGroup CCAe)
+     appNewVersion=$(versionFromGit ThePacielloGroup CCAe)
+     expectedTeamID="34RS4UC3M6"
+     blockingProcesses=( NONE )
+     ;;
--- a/fragments/labels/cormorant.sh
+++ b/fragments/labels/cormorant.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/cryptomator.sh
@@ -0,0 +1,7 @@
+cryptomator)
+    name="Cryptomator"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit cryptomator cryptomator)
+    appNewVersion=$(versionFromGit cryptomator cryptomator)
+    expectedTeamID="YZQJQUHA3L"
+    ;;
--- a/fragments/labels/cyberduck.sh
+++ b/fragments/labels/cyberduck.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/dangerzone.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/darktable.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/dbeaverce.sh
@@ -0,0 +1,7 @@
+dbeaverce)
+    name="DBeaver"
+    type="dmg"
+    downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg"
+    expectedTeamID="42B6MDKMW8"
+    blockingProcesses=( dbeaver )
+    ;;
--- a/fragments/labels/debookee.sh
+++ b/fragments/labels/debookee.sh
@@ -0,0 +1,6 @@
+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.sh
+++ b/fragments/labels/defaultfolderx.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/depnotify.sh
@@ -0,0 +1,7 @@
+depnotify)
+    name="DEPNotify"
+    type="zip"
+    downloadURL="https://files.nomad.menu/DEPNotify.zip"
+    expectedTeamID="VRPY9KHGX6"
+    targetDir="/Applications/Utilities"
+    ;;
--- a/fragments/labels/desktoppr.sh
+++ b/fragments/labels/desktoppr.sh
@@ -0,0 +1,9 @@
+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.sh
+++ b/fragments/labels/detectxswift.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/devonthink.sh
@@ -0,0 +1,9 @@
+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 '"' '\n' | tr "'" '\n' | grep -e '^https://' )
+    appNewVersion=$( echo ${downloadURL} | tr '/' '\n' | grep "[0-9]" | grep "[.]" | head -1 )
+    expectedTeamID="679S2QUWR8"
+    ;;
--- a/fragments/labels/dialpad.sh
+++ b/fragments/labels/dialpad.sh
@@ -0,0 +1,7 @@
+dialpad)
+    # credit: @ehosaka
+    name="Dialpad"
+    type="dmg"
+    downloadURL="https://storage.googleapis.com/dialpad_native/osx/Dialpad.dmg"
+    expectedTeamID="9V29MQSZ9M"
+    ;;
--- a/fragments/labels/discord.sh
+++ b/fragments/labels/discord.sh
@@ -0,0 +1,6 @@
+discord)
+    name="Discord"
+    type="dmg"
+    downloadURL="https://discordapp.com/api/download?platform=osx"
+    expectedTeamID="53Q6R32WPB"
+    ;;
--- a/fragments/labels/docker.sh
+++ b/fragments/labels/docker.sh
@@ -0,0 +1,13 @@
+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.sh
+++ b/fragments/labels/drift.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/dropbox.sh
@@ -0,0 +1,6 @@
+dropbox)
+    name="Dropbox"
+    type="dmg"
+    downloadURL="https://www.dropbox.com/download?plat=mac&full=1"
+    expectedTeamID="G7HH3F8CAK"
+    ;;
--- a/fragments/labels/easeusdatarecoverywizard.sh
+++ b/fragments/labels/easeusdatarecoverywizard.sh
@@ -0,0 +1,8 @@
+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 '\r\n' )
+    #appNewVersion=""
+    expectedTeamID="DLLVW95FSM"
+    ;;
--- a/fragments/labels/egnyte.sh
+++ b/fragments/labels/egnyte.sh
@@ -0,0 +1,8 @@
+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.sh
+++ b/fragments/labels/element.sh
@@ -0,0 +1,7 @@
+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.sh
+++ b/fragments/labels/eraseinstall.sh
@@ -0,0 +1,6 @@
+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.sh
+++ b/fragments/labels/etrecheck.sh
@@ -0,0 +1,7 @@
+etrecheck)
+    # credit: @dvsjr macadmins slack
+    name="EtreCheckPro"
+    type="zip"
+    downloadURL="https://cdn.etrecheck.com/EtreCheckPro.zip"
+    expectedTeamID="U87NE528LC"
+    ;;
--- a/fragments/labels/evernote.sh
+++ b/fragments/labels/evernote.sh
@@ -0,0 +1,8 @@
+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/Show More
+++ b/Show More
Author	SHA1	Message	Date
Armin Briegel	2d48072d8e	updated utils/ReadMe.md (more typos and clarifications)	2021-08-17 16:09:04 +02:00
Armin Briegel	4101056ede	updated CHANGELOG, main script, Labels.txt and the assemble script ReadMe	2021-08-17 15:47:23 +02:00
Armin Briegel	08ede3a447	added screencloudplayer, closes #233	2021-08-17 14:26:59 +02:00
Armin Briegel	6f26c70bde	added boxtools, closes #228	2021-08-17 14:24:12 +02:00
Armin Briegel	cc13ed9c47	updated zoomclient, closes #226	2021-08-17 14:22:52 +02:00
Armin Briegel	470b1dd69f	added jetbrainsdatagrip, closes #225	2021-08-17 14:20:58 +02:00
Armin Briegel	4d34931be5	added platypus, closes #224	2021-08-17 14:18:57 +02:00
Armin Briegel	96b52e631f	updated ferdi, closes #223	2021-08-17 14:17:26 +02:00
Armin Briegel	7bb757e38f	updated microsoftteams as per #219	2021-08-17 14:13:01 +02:00
Armin Briegel	b465b3fa3b	added colourcontrastanalyser, closes #218	2021-08-17 14:10:06 +02:00
Armin Briegel	37c23ff1ce	added scaleft, closes #216	2021-08-17 14:07:21 +02:00
Armin Briegel	ea134a68d1	added zulujdk8, closes #187	2021-08-17 14:05:21 +02:00
Armin Briegel	61a8ae9018	added asana, closes #182	2021-08-17 14:00:20 +02:00
Armin Briegel	1f33c6bb96	removed buildInstallomatorPkg.sh since this is now done by assemble.sh	2021-08-17 13:47:18 +02:00
Armin Briegel	87c9aaaedc	Update README.md	2021-08-17 13:46:44 +02:00
Armin Briegel	cd58fc6018	multiple custom labels now work	2021-08-17 13:39:36 +02:00
Armin Briegel	b38c49600f	implemented --pkg and --notarize options	2021-08-17 12:25:59 +02:00
Armin Briegel	af08a12d49	implemented option to overwrite main script	2021-08-17 10:25:28 +02:00
Armin Briegel	2e72b05df1	finished updating labels	2021-08-16 16:55:28 +02:00
Armin Briegel	97e8c160d2	updated fragements	2021-08-16 16:16:36 +02:00
Armin Briegel	dcba9f9eb7	new labels after merge	2021-08-16 15:49:43 +02:00
Armin Briegel	bb6058c7f6	Merge branch 'dev' into fragments	2021-08-16 15:48:13 +02:00
Adam Codega	d4f2d07289	Merge pull request #211 from Installomator/Zoom-Room-label Zoom Rooms label	2021-07-21 22:48:17 -04:00
Adam Codega	e1c75dc721	Merge pull request #222 from adibue/adibue-hyper-m1 Got 'hyper' ready for Apple Silicon	2021-07-21 22:43:55 -04:00
Adam Codega	fae3384b33	Merge pull request #217 from imfromthebay/imfromthebay-caffeine Adding Caffeine	2021-07-21 22:43:13 -04:00
Søren Theilgaard	0c17713751	Update Installomator.sh	2021-07-20 19:51:44 +02:00
Adrian Bühler	85318cc508	Got 'hyper' ready for Apple Silicon `hyper` now supports Apple Silicon	2021-07-19 10:30:16 +02:00
Søren Theilgaard	301bc11d20	Minor comment Just added a bit to a comment	2021-07-18 20:21:31 +02:00
Greg R	263e29329c	Adding Caffeine app to Installomator Adding support for the Caffeine app.	2021-07-17 12:18:46 -07:00
Søren Theilgaard	54c84b2ff7	Zoom Room	2021-07-16 09:49:34 +02:00
Søren Theilgaard	d2422653d5	Zoom Room label	2021-07-16 09:48:24 +02:00
Armin Briegel	3f9daf7fe6	changed file extension for fragments to sh	2021-06-24 11:50:29 +02:00
Armin Briegel	bc9bc74cf9	changed fragments to .sh extension	2021-04-28 09:36:16 +02:00
Armin Briegel	0e093dd3b5	implemented the --labels option and assemble script now runs the assembled Installomator.sh with remaining arguments	2021-04-22 16:37:11 +02:00
Armin Briegel	fbc6b61add	moved more stuff around	2021-04-21 12:24:47 +02:00
Armin Briegel	248c90bec7	added Readme to utils	2021-04-21 11:31:18 +02:00
Armin Briegel	8ffc4dd88b	created a utils directory	2021-04-21 11:30:58 +02:00
Armin Briegel	448a11a1b6	extracted labels	2021-04-20 16:31:52 +02:00