Create forticlient_ztna.sh

2026-03-09 05:11:59 +00:00 · 2022-05-12 15:55:25 +02:00
80 changed files with 278 additions and 1276 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,71 +1,6 @@
-## v9.2
-
-**Note**: Both Google and Mozilla recommend using the pkg installers instead of the dmg downloads for managed deployments. So far, Installomator has provided labels for both. (`googlechrome` and `googlechromepkg` or `firefox` and `firefoxpkg`, respectively) Since there are problems with the dmg downloads, a future release of Installomator will _disable_ the `firefox` and `googlechrome` dmg labels. You should switch to using `googlechromepkg` and `firefoxpkg` labels instead.
-
- bug fix (#434)
- documentation updates (#485, #494)
- new labels:
-    - 1password8 (#514)
-	- ultimakercura
-	- androidstudio (#547)
-	- atextlegacy (#464)
-	- camtasia2019, camtasia2020 (#499)
-	- clue, cluefull (#481)
-	- craftmanagerforsketch
-	- displaylinkmanager (#448)
-	- drawio (#480)
-	- duckduckgo
-	- egnytewebedit (#512)
-	- filezilla (#522)
-	- firefoxpkg_intl
-	- flycut (#501)
-	- fontexplorer (#523)
-	- hype (#524)
-	- idrive (#507), idrivethin (#509)
-	- imageoptim (#525)
-	- linear (#519)
-	- macoslaps (#502)
-	- mightymike
-	- mindmanager (#479)
-	- pika (#526)
-	- propresenter7 (#394)
-	- qgis-pr
-	- shottr (#516)
-	- slab (#487)
-	- snagit2019, snagit2020, snagit2021 (#498)
-	- sonobus (#490)
-	- talkdeskcxcloud (#452)
-	- thunderbird_intl (#497)
-	- unnaturalscrollwheels (#503)
-	- wechat (#510)
-	- xeroxworkcentre7800 (#527)
-	- zohoworkdrivegenie
- updated labels
-	- adobereaderdc-update, adobereaderdc (#503)
-	- amazoncorretto8jdk (#461)
-	- camtasia (#499)
-	- citrixworkspace (#508)
-	- dbeaverce (#450)
-	- dropbox
-	- firefox, firefox_da, firefox_intl (#495), firefoxesr_intl (#496), firefoxpkg
-	- googlechrome, googlechromepkg (#484)
-	- gpgsuite (#465)
-	- grammarly (#515)
-	- logitechoptions (#478)
-	- onlyofficedesktop (#454)
-	- postman (#458)
-	- rancherdesktop (#463)
-	- remotedesktopmanagerenterprise
-	- remotedesktopmanagerfree
-	- ringcentralapp (#492)
-	- sketch
-	- snagit (#498)
-	- talkdeskcallbar (#453)
-
-
-
 ## v9.1

+**Note**: Both Google and Mozilla recommend using the pkg installers instead of the dmg downloads for managed deployments. So far, Installomator has provided labels for both. (`googlechrome` and `googlechromepkg` or `firefox` and `firefoxpkg`, respectively) Since there are problems with the dmg downloads, a future release of Installomator will _disable_ the `firefox` and `googlechrome` dmg labels. You should switch to using the respective pkg labels instead.

 - added option for Microsoft Endpoint Manager (Intune) to `LOGO` (#446)
 - minor fixes (#427, #434, #436)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,35 +1,33 @@
 # Contributing to Installomator

-__Please note, that if you are contributing to this project with new labels or other suggestions in PRs, please put your changes in the files in the `fragments` sub-folder. DO NOT edit the full `Installomator.sh` script. The full script is generated from the fragments, and will be overwritten. More details on [how the script is assembled from the fragments here](https://github.com/Installomator/Installomator/tree/main/utils#how-to-assemble-installomatorsh).__
+__Please note, that if you are contributing to this project with new labels or other suggestions in PRs, please put your changes in the files below `fragments`-folder. DO NOT edit the full `Installomator.sh` script. The full script is now a build of the fragments, and will be overwritten.__

-We try to keep the script as short as possible, and with more than 400 labels, we can save 400 lines in the script, if we do not have credit lines on each of these. So we are thankful for your contribution, but we will be removing these lines in the coming releases.
+We try to keep the script as short as possible, and with more than 300 labels, we can save 300 lines in the script, if we do not have credit lines on each of these. So we are thankful for your contribution, but we will be removing these lines in the coming releases.

 ## Branches

 The branch list is as follows:

 - `release`: this branch will have the latest released version
- `main`: (default) this branch will be the current build we are working on. It includes new and updated app labels, and critical bug fixes
- `dev`: this will contain new and updated app labels, as well as other code changes that have the risk of significantly changing or breaking behavior
-there will be other branches for new features and testing.
+- `main`: (default) this branch will be the latest release plus new and updated app labels, and critical bug fixes
+- `dev`: this will contain new and updated app labels, as well as any other code changes
+there will be other branches for new features and testing

 This should allow the contributing team to release minor updates for new and updated app labels while also work on new features for the next major release.

 With all the new branches, your local repo may get confused. If you don’t have local changes, it is easiest to delete your local repo and re-clone it. If you have local changes you want to preserve, then you should commit those to a local branch, pull the latest changes `git pull --all`, then delete the old master branch: `git branch -d master`.

-Please make sure you branch off of main for your PRs.
-
-__Thank you for contributing!__
+Make sure you branch off of main for new and updated labels and off of `dev` for other code changes. Thank you for contributing!

 ## Labels

-If you need a new label for a piece of software, please take a look [at the tutorials in the Wiki](https://github.com/Installomator/Installomator/wiki#tutorials), those can be helpful for starting out on the creation of the label.
+If you need a new label for a piece of software, please take a look at the tutorials in the Wiki, if those can be helpful for starting out on the creation of the label.

 We expect you to try out finding the __version__ of the software online, so that `appNewVersion` can be filled in the label. It helps a lot when the software needs update, and greatly improve user experience.

 Please document what you found out about the __version__ of the software if it's not included. We will not accept a new label if this is not documented, we will ask about this if it was not included. This is very important for the quality and reliability of Installomator.

-When creating a new label, please file a pull request (PR). And feel free to ask questions or make your comments about what else is needed, if we should take a look at the label, or help out in finding the version or isolating URLs or anything else. You can find [a tutorial on how to create a PR here](https://github.com/Installomator/Installomator/wiki/GitHub-howto-create-PRs).
+When creating a new label, please file a pull request (PR). And feel free to ask questions or make your comments about what else is needed, if we should take a look at the label, or help out in finding the version or isolating URLs or anything else.

 Please include the log of installing this label in the description, like this:
 ```
@@ -41,13 +39,11 @@ Please include the log of installing this label in the description, like this:

 Please have one label per PR, so we can separate these. Also if you change/fix a label.

-__Thank you very much for your contribution!__
+Thank you very much for your contribution!


 ## Issues

-Do not create an issue just when you have a questions, but do file an issue or pull request (PR) for bugs or wrong behavior. Include the full log and include the version of Installomator you're running. When you create a PR to follow-up and solve an issue make sure to [mention the issue using the `#xxx` syntax in a commit message or comment to link the issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
-
-Join [the MacAdmins Slack](https://macadmins.org) and find us in the `#installomator` channel for questions, support and discussions. 
+Do not create an issue just when you have a questions, but do file an issue or pull request (PR) for bugs or wrong behavior. Include the full log and include the version of Installomator you're running.

 When in doubt, use the MacAdmins.org Slack as described in [README.md](https://github.com/Installomator/Installomator/)
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -238,7 +238,7 @@ IGNORE_DND_APPS=""
 # - updateToolArguments:
 #   When Installomator detects an existing installation of the application,
 #   and the updateTool variable is set
-#       $updateTool $updateArguments
+#      $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 on various Microsoft labels
@@ -253,7 +253,7 @@ IGNORE_DND_APPS=""
 #   We need to define `name` for the installed app (to be version checked), as well as
 #   `installerTool` for the installer app (if named differently than `name`. Installomator
 #   will add the path to the folder/disk image with the binary, and it will be called like this:
-#       $CLIInstaller $CLIArguments
+     `$CLIInstaller $CLIArguments`
 #   For most installations `CLIInstaller` should contain the `installerTool` for the CLI call
 #   (if it’s the same).
 #   We can support a whole range of other software titles by implementing this.
@@ -302,8 +302,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then
        rosetta2=no
    fi
 fi
-VERSION="10.0beta"
-VERSIONDATE="2022-05-19"
+VERSION="9.1"
+VERSIONDATE="2022-03-18"

 # MARK: Functions

@@ -549,8 +549,8 @@ getAppVersion() {
 #        printlog "App(s) found: ${applist}" DEBUG
 #        applist=$(mdfind "kind:application AND name:$appName" -0 )
    fi
-    if [[ -z $applist ]]; then
-        printlog "No previous app found" WARN
+    if [[ -z applist ]]; then
+        printlog "No previous app found" INFO
    else
        printlog "App(s) found: ${applist}" INFO
    fi
@@ -572,7 +572,7 @@ getAppVersion() {
            if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then
                printlog "Installed $appName is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace."
                if [[ $IGNORE_APP_STORE_APPS == "yes" ]]; then
-                    printlog "Replacing App Store apps, no matter the version" WARN
+                    printlog "Replacing App Store apps, no matter the version"
                    appversion=0
                else
                    cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR
@@ -1302,21 +1302,6 @@ valuesfromarguments)
    blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" )
    #forcefulQuit=YES
    ;;
-1password8)
-    name="1Password 8"
-    appName="1Password.app"
-    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-        archiveName="1Password-latest-aarch64.zip"
-        downloadURL="https://downloads.1password.com/mac/1Password-latest-aarch64.zip"
-    elif [[ $(arch) == "i386" ]]; then
-        archiveName="1Password-latest-x86_64.zip"
-        downloadURL="https://downloads.1password.com/mac/1Password-latest-x86_64.zip"
-    fi
-    expectedTeamID="2BUA8C4S2C"
-    blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" )
-    #forcefulQuit=YES
-    ;;
 1passwordcli)
    name="1Password CLI"
    type="pkg"
@@ -1387,7 +1372,7 @@ adobecreativeclouddesktop)
 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 https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
+    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"
@@ -1398,8 +1383,7 @@ 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)
-    downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
+    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"
@@ -1468,13 +1452,8 @@ amazonchime)
 amazoncorretto8jdk)
 name="Amazon Corretto 8 JDK"
 type="pkg"
-	if [[ $(arch) == "arm64" ]]; then
-		downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-aarch64-macos-jdk.pkg"
-		appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
-	elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg"
-        appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
-    fi
+	downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg"
+	appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
 expectedTeamID="94KV3E626L"
 ;;
 amazonworkspaces)
@@ -1491,19 +1470,6 @@ androidfiletransfer)
    downloadURL="https://dl.google.com/dl/androidjumper/mtp/current/AndroidFileTransfer.dmg"
    expectedTeamID="EQHXZ8M8AV"
    ;;
-androidstudio)
-    name="Android Studio"
-    type="dmg"
-    if [[ $(arch) == arm64 ]]; then
-	 downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i arm.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1)
-	 appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' )
-    elif [[ $(arch) == i386 ]]; then
-     downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i mac.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1)
-	 appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' )
-	fi
-    expectedTeamID="EQHXZ8M8AV"
-    blockingProcesses=( androidstudio )
-    ;;
 anydesk)
    name="AnyDesk"
    type="dmg"
@@ -1598,13 +1564,6 @@ atext)
    downloadURL="https://trankynam.com/atext/downloads/aText.dmg"
    expectedTeamID="KHEMQ2FD9E"
    ;;
-atextlegacy)
-     # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-     name="aText"
-     type="dmg"
-     downloadURL="https://trankynam.com/atext/downloads/aTextLegacy.dmg"
-     expectedTeamID="KHEMQ2FD9E"
-     ;;
 atom)
    name="Atom"
    type="zip"
@@ -1844,26 +1803,10 @@ camostudio)
    # Camo Studio will ask for admin permissions to install som plug-ins. that has not been handled.
    expectedTeamID="Q248YREB53"
    ;;
-camtasia|\
-camtasia2021)
-    name="Camtasia 2021"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2021" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
-camtasia2019)
-    name="Camtasia 2019"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2019" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
-camtasia2020)
+camtasia)
    name="Camtasia 2020"
    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2020" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
+    downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg
    expectedTeamID="7TQL462TU8"
    ;;
 canva)
@@ -1896,7 +1839,7 @@ citrixworkspace)
    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 | awk '{print $2}' | cut -d "." -f 1-3)
+    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"
    ;;
 clevershare2)
@@ -1934,24 +1877,6 @@ cloudya)
    appNewVersion="$(curl -fs https://www.nfon.com/de/service/downloads | grep -i -E -o "Cloudya Desktop App MAC [0-9.]*" | sed 's/^.*\ \([^ ]\{0,7\}\)$/\1/g')"
    expectedTeamID="X26F74J8TH"
    ;;
-clue)
-    #For personal use and students
-    name="Clue"
-    type="dmg"
-    downloadURL=$(curl -fsL https://clue.no/en/download | grep "For personal use and students:" | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\..*/\1/g')"
-    versionKey="CFBundleVersion"
-    expectedTeamID="3NX6B9TB2F"
-    ;;
-cluefull)
-    #For companies and schools
-    name="Clue"
-    type="dmg"
-    downloadURL=$(curl -fsL https://clue.no/en/download | grep "For companies and schools:" | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\F.*/\1/g')"
-    versionKey="CFBundleVersion"
-    expectedTeamID="3NX6B9TB2F"
-    ;;
 code42)
    name="Code42"
    type="pkgInDmg"
@@ -1994,13 +1919,6 @@ craftmanager)
    appNewVersion="$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | head -1 | cut -d '"' -f 2)"
    expectedTeamID="VRXQSNCL5W"
    ;;
-craftmanagerforsketch)
-    name="CraftManager"
-    type="zip"
-    downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip"
-    appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2)
-    expectedTeamID="VRXQSNCL5W"
-    ;;
 cryptomator)
    name="Cryptomator"
    type="dmg"
@@ -2040,13 +1958,7 @@ darktable)
 dbeaverce)
    name="DBeaver"
    type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
-        downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos-aarch64.dmg"
-        appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^location | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)"
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg"
-        appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^location | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' | head -1)"
-    fi
+    downloadURL="https://dbeaver.io/files/dbeaver-ce-latest-macos.dmg"
    expectedTeamID="42B6MDKMW8"
    blockingProcesses=( dbeaver )
    ;;
@@ -2127,14 +2039,6 @@ diskspace)
    appNewVersion="$(versionFromGit scriptingosx diskspace)"
    expectedTeamID="JME5BW3F3R"
    ;;
-displaylinkmanager)
-    name="DisplayLink Manager"
-    type="pkg"
-    #packageID="com.displaylink.displaylinkmanagerapp"
-    downloadURL=https://www.synaptics.com$(redirect=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep 'class="download-link">Download' | head -n 1 | sed 's/.*href="//' | sed 's/".*//') && curl -sfL "https://www.synaptics.com$redirect" | grep Accept | head -n 1 | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep "Release:" | head -n 1 | cut -d ' ' -f2)
-    expectedTeamID="73YQY62QM3"
-    ;;
 docker)
    name="Docker"
    type="dmg"
@@ -2156,15 +2060,6 @@ dockutil)
    expectedTeamID="Z5J8CJBUWC"
    blockingProcesses=( NONE )
    ;;
-drawio)
-    name="draw.io"
-    type="dmg"
-    archiveName="draw.io-universal-[0-9.]*.dmg"
-    downloadURL="$(downloadURLFromGit jgraph drawio-desktop)"
-    appNewVersion="$(versionFromGit jgraph drawio-desktop)"
-    expectedTeamID="UZEUFB4N53"
-    blockingProcesses=( draw.io )
-    ;;
 drift)
    # credit Elena Ackley (@elenaelago)
    name="Drift"
@@ -2176,19 +2071,8 @@ dropbox)
    name="Dropbox"
    type="dmg"
    downloadURL="https://www.dropbox.com/download?plat=mac&full=1"
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | sed -E 's/.*%20([0-9.]*)\.dmg/\1/g')
    expectedTeamID="G7HH3F8CAK"
    ;;
-duckduckgo)
-    name="DuckDuckGo"
-    type="dmg"
-    #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg"
-    #downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2)
-    downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2)
-    #appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2)
-    appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/sparkle:shortVersionString)[1]' 2>/dev/null | cut -d ">" -f2 | cut -d "<" -f1)
-    expectedTeamID="HKE973VLUW"
-    ;;
 easeusdatarecoverywizard)
    # credit: Søren Theilgaard (@theilgaard)
    name="EaseUS Data Recovery Wizard"
@@ -2212,15 +2096,6 @@ egnyte)
    expectedTeamID="FELUD555VC"
    blockingProcesses=( NONE )
    ;;
-egnytewebedit)
-    name="EgnyteWebEdit"
-    type="pkg"
-    downloadURL="https://egnyte-cdn.egnyte.com/webedit/mac/en-us/latest/EgnyteWebEdit.pkg"
-    expectedTeamID="FELUD555VC"
-    appName="Egnyte WebEdit.app"
-    blockingProcesses=( NONE )
-    ;;
-    
 element)
    name="Element"
    type="dmg"
@@ -2318,16 +2193,6 @@ figma)
    appNewVersion="$(curl -fsL https://desktop.figma.com/mac/RELEASE.json | awk -F '"' '{ print $8 }')"
    expectedTeamID="T8RA8NE3B7"
    ;;
-filezilla)
-    name="FileZilla"
-    type="tbz"
-    packageID="org.filezilla-project.filezilla"
-    downloadURL=$(curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '"' '{print $2}' )
-    appNewVersion=$( curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '_' '{print $2}' )
-    expectedTeamID="5VPGKXL75N"
-    blockingProcesses=( NONE )
-    ;;
-
 findanyfile)
    name="Find Any File"
    type="zip"
@@ -2342,7 +2207,6 @@ firefox)
    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
 firefox_da)
    name="Firefox"
@@ -2351,33 +2215,29 @@ firefox_da)
    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox, firefox_da and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
 firefox_intl)
-    # This label will try to figure out the selected language of the user,
+    # This label will try to figure out the selected language of the user, 
    # and install corrosponding version of Firefox
    name="Firefox"
    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
-    printlog "Found language $userLanguage to be used for $name."
-    releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt"
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
-        if [ ${#userLanguage} -eq 2 ]; then
-            break
+    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
+    printlog "Found language $userLanguage to be used for Firefox."
+    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
+        userLanguage=$(echo $userLanguage | cut -c 1-2)
+        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
+            userLanguage="en_US"
        fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx"
    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}')
+    printlog "Using language $userLanguage for download."
+    downloadURL="https://download.mozilla.org/?product=firefox-latest&amp;os=osx&amp;lang=$userLanguage"
+    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
+        printlog "Download not found for that language. Using en-US"
+        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
+    fi
+    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
 firefoxesr|\
 firefoxesrpkg)
@@ -2389,60 +2249,33 @@ firefoxesrpkg)
    blockingProcesses=( firefox )
    ;;
 firefoxesr_intl)
-    # This label will try to figure out the selected language of the user,
+    # This label will try to figure out the selected language of the user, 
    # and install corrosponding version of Firefox ESR
    name="Firefox"
    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
-    printlog "Found language $userLanguage to be used for $name."
-    releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt"
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
-        if [ ${#userLanguage} -eq 2 ]; then
-            break
+    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
+    printlog "Found language $userLanguage to be used for Firefox."
+    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep -o "=$userLanguage"; then
+        userLanguage=$(echo $userLanguage | cut -c 1-2)
+        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep "=$userLanguage"; then
+            userLanguage="en_US"
        fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx"
    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"esr/"); print a[1]}')
+    printlog "Using language $userLanguage for download."
+    downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage"
+    # https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US
+    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
+        printlog "Download not found for that language. Using en-US"
+        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
+    fi
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g')
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
 firefoxpkg)
    name="Firefox"
    type="pkg"
    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
-firefoxpkg_intl)
-    # This label will try to figure out the selected language of the user,
-    # and install corrosponding version of Firefox ESR
-    name="Firefox"
-    type="pkg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for Firefox." WARN
-    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
-        userLanguage=$(echo $userLanguage | cut -c 1-2)
-        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
-            userLanguage="en_US"
-        fi
-    fi
-    printlog "Using language $userLanguage for download." WARN
-    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=$userLanguage"
-    # https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US
-    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
-        printlog "Download not found for that language. Using en-US" WARN
-        downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    fi
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location | cut -d "/" -f7)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    ;;
@@ -2461,23 +2294,6 @@ flux)
    expectedTeamID="VZKSA7H9J9"
    ;;
    
-flycut)
-    name="Flycut"
-    type="zip"
-    archiveName="Flycut.[0-9.]*.zip"
-    downloadURL="$(downloadURLFromGit TermiT Flycut)"
-    appNewVersion=$(versionFromGit TermiT Flycut )
-    expectedTeamID="S8JLSG5ES7"
-;;
-fontexplorer)
-    name="FontExplorer X Pro"
-    type="dmg"
-    packageID="com.linotype.FontExplorerX"
-    downloadURL="http://www.fontexplorerx.com/download/free-trial/Mac/"
-    appNewVersion=$( curl -fsL http://fex.linotype.com/update/client/mac/pro/version.plist | grep string | tail -n 1 | sed 's/[^0-9.]//g' )
-    expectedTeamID="2V7G2B7WG4"
-    ;;
-
 front)
    name="Front"
    type="dmg"
@@ -2530,7 +2346,6 @@ googlechrome)
    downloadURL="https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg"
    appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
    expectedTeamID="EQHXZ8M8AV"
-    printlog "WARNING for ERROR: Label googlechrome should not be used. Instead use googlechromepkg as per recommendations from Google. It's not fully certain that the app actually gets updated here. googlechromepkg will have built in updates and make sure the client is updated in the future." REQ
    ;;
 googlechromepkg)
    name="Google Chrome"
@@ -2540,7 +2355,6 @@ googlechromepkg)
    # https://support.google.com/chrome/a/answer/9915669
    #
    downloadURL="https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg"
-    appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
    expectedTeamID="EQHXZ8M8AV"
    updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent"
    updateToolArguments=( -runMode oneshot -userInitiated YES )
@@ -2598,7 +2412,6 @@ gpgsuite)
    type="pkgInDmg"
    pkgName="Install.pkg"
    downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4)
-    appNewVersion=$(echo $downloadURL | cut -d "-" -f 2 | cut -d "." -f 1-2)
    expectedTeamID="PKV8ZPD836"
    blockingProcesses=( "GPG Keychain" )
    ;;
@@ -2611,16 +2424,14 @@ gpgsync)
    expectedTeamID="P24U45L8P5"
    ;;
 grammarly)
-     name="Grammarly Desktop"
-     type="dmg"
-     packageID="com.grammarly.ProjectLlama"
-     downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-     expectedTeamID="W8F64X92K3"
-     appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4)
-     # appName="Grammarly Installer.app"
-     installerTool="Grammarly Installer.app"
-     CLIInstaller="Grammarly Installer.app/Contents/MacOS/Grammarly Desktop"
-;;
+    name="Grammarly Desktop"
+    type="dmg"
+    packageID="com.grammarly.ProjectLlama"
+    downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
+    expectedTeamID="W8F64X92K3"
+    appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4)
+    appName="Grammarly Installer.app"
+    ;;
 grandperspective)
    name="GrandPerspective"
    type="dmg"
@@ -2696,15 +2507,6 @@ hpeasystart)
    downloadURL="https://ftp.hp.com/pub/softlib/software12/HP_Quick_Start/osx/Applications/HP_Easy_Start.app.zip"
    expectedTeamID="6HB5Y2QTA3"
    ;;
-hype)
-    name="Hype4"
-    type="dmg"
-    packageID="com.tumult.Hype4"
-    downloadURL="https://static.tumult.com/hype/download/Hype.dmg"
-    appNewVersion=$( curl -fsL https://tumult.com/hype/download/all/ | grep Ongoing | awk -F '<' '{print $4}' | sed 's/[^0-9.]//g' )
-    expectedTeamID="8J356DM772"
-    blockingProcesses=( NONE )
-    ;;
 hyper)
    name="Hyper"
    type="dmg"
@@ -2732,24 +2534,6 @@ icons)
    appNewVersion=$(versionFromGit sap macOS-icon-generator )
    expectedTeamID="7R5ZEU67FQ"
    ;;
-idrive)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDrive.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*(https.*dmg).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*mac_vernum\=\"Version\ ([0-9.]*).*/\1/g')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;
-idrivethin)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDriveThin.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thinclient-mac([^;]*).*/\1/g' | sed -E 's/.*(https.*dmg).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thin\_mac\_ver\=\"Version\ ([0-9.]*).*/\1/g')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;
 iina)
    name="IINA"
    type="dmg"
@@ -2757,15 +2541,6 @@ iina)
    appNewVersion=$(versionFromGit iina iina )
    expectedTeamID="67CQ77V27R"
    ;;
-imageoptim)
-    name="imageoptim"
-    type="tbz"
-    packageID="net.pornel.ImageOptim"
-    downloadURL="https://imageoptim.com/ImageOptim.tbz2"
-    appNewVersion=$( curl -fsL https://imageoptim.com/appcast.xml | grep "title" | tail -n 1 | sed 's/[^0-9.]//g' )
-    expectedTeamID="59KZTZA4XR"
-    blockingProcesses=( NONE )
-    ;;
 imazingprofileeditor)
    # Credit: Bilal Habib @Pro4TLZZ
    name="iMazing Profile Editor"
@@ -3100,24 +2875,8 @@ libreoffice)
    expectedTeamID="7P5S3ZLCN7"
    blockingProcesses=( soffice )
    ;;
-linear)
-    name="Linear"
-    type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
-        downloadURL="https://desktop.linear.app/mac/dmg/arm64"
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://desktop.linear.app/mac/dmg"
-    fi
-    appNewVersion=$(curl -sIkL $downloadURL | sed -r '/filename=/!d;s/.*filename=(.*)$/\1/' | awk '{print $2}')
-    expectedTeamID="7VZ2S3V9RV"
-    versionKey="CFBundleShortVersionString"
-    appName="Linear.app"
-    blockingProcesses=( "Linear" )
-    ;;
-    
-logioptions|\
 logitechoptions)
-    name="Logi Options"
+    name="Logitech Options"
    type="pkgInZip"
    #downloadURL=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip" | head -1)
    downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip"
@@ -3198,14 +2957,6 @@ macfuse)
    appNewVersion=$(versionFromGit osxfuse osxfuse)
    expectedTeamID="3T5GSNBU6W"
    ;;
-macoslaps)
-    name="macOSLAPS"
-    type="pkg"
-    packageID="edu.psu.macOSLAPS"
-    downloadURL="$(downloadURLFromGit joshua-d-miller macOSLAPS)"
-    appNewVersion="$(versionFromGit joshua-d-miller macOSLAPS)"
-    expectedTeamID="9UYK4F9BSM"
-    ;;
 macports)
    name="MacPorts"
    type="pkg"
@@ -3547,20 +3298,6 @@ microsoftyammer)
    #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate --list; /Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
    #updateToolArguments=( --install --apps ?????? )
    ;;
-mightymike)
-    name="Mighty Mike"
-    type="dmg"
-    downloadURL=$(downloadURLFromGit jorio MightyMike)
-    appNewVersion=$(versionFromGit jorio MightyMike)
-    expectedTeamID="RVNL7XC27G"
-    ;;
-mindmanager)
-    name="MindManager"
-    type="dmg"
-    downloadURL="https://www.mindmanager.com/mm-mac-dmg"
-    appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*_Mac_*([0-9.]*)\..*/\1/g')"
-    expectedTeamID="ZF6ZZ779N5"
-    ;;
 miro)
    # credit: @matins
    name="Miro"
@@ -3848,12 +3585,7 @@ onionshare)
 onlyofficedesktop)
    name="ONLYOFFICE"
    type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
-    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/arm/distrib/ONLYOFFICE.dmg"
-    elif [[ $(arch) == "i386" ]]; then
-    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/x86_64/distrib/ONLYOFFICE.dmg"
-    fi
-    appNewVersion=$(versionFromGit ONLYOFFICE DesktopEditors)
+    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/distrib/onlyoffice/ONLYOFFICE.dmg"
    expectedTeamID="2WH24U26GJ"
    ;;
 openvpnconnect)
@@ -3945,15 +3677,6 @@ perimeter81)
    appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i ^x-amz-meta-version | sed -E 's/x-amz-meta-version: //' | cut -d"." -f1-3)"
    expectedTeamID="924635PD62"
    ;;
-pika)
-    name="Pika"
-    type="dmg"
-    packageID="com.superhighfives.Pika"
-    downloadURL=$(downloadURLFromGit "superhighfives" "pika")
-    appNewVersion=$(versionFromGit "superhighfives" "pika")
-    expectedTeamID="TGHU37N6EX"
-    blockingProcesses=( NONE )
-    ;;
 pitch)
    name="Pitch"
    type="dmg"
@@ -3981,15 +3704,11 @@ plisteditpro)
    expectedTeamID="8NQ43ND65V"
    ;;
 postman)
+    # credit: Mischa van der Bent
    name="Postman"
    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-    	downloadURL="https://dl.pstmn.io/download/latest/osx_arm64"
-		appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
-	elif [[ $(arch) == "i386" ]]; then
-		downloadURL="https://dl.pstmn.io/download/latest/osx_64"
-		appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
-	fi
+    downloadURL="https://dl.pstmn.io/download/latest/osx"
+    appNewVersion=$(curl -Ifs https://dl.pstmn.io/download/latest/osx | grep "content-disposition:" | sed -n -e 's/^.*Postman-osx-//p' | sed 's/\.zip//' | sed $'s/[^[:print:]\t]//g' )
    expectedTeamID="H7H8Q7M5CK"
    ;;
 prism9)
@@ -4034,15 +3753,6 @@ promiseutilityr)
    downloadURL="https://www.promise.com/DownloadFile.aspx?DownloadFileUID=6533"
    expectedTeamID="268CCUR4WN"
    ;;
-propresenter7)
-    name="ProPresenter 7"
-    appName="ProPresenter.app"
-    type="zip"
-    blockingProcesses="ProPresenter"
-    downloadURL=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"downloadUrl":.*?[^\]",' | head -n 1 | cut -d \" -f 4 | sed -e 's/\\//g')
-    appNewVersion=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"version":.*?[^\]",' | head -n 1 | cut -d \" -f 4)
-    expectedTeamID="97GAAZ6CPX"
-    ;;
 protonvpn)
    name="ProtonVPN"
    type="dmg"
@@ -4064,13 +3774,6 @@ pymol)
    downloadURL=$(curl -s -L "https://pymol.org/" | grep -m 1 -Eio 'href="https://pymol.org/installers/PyMOL-(.*)-MacOS(.*).dmg"' | cut -c7- | sed -e 's/"$//')
    expectedTeamID="26SDDJ756N"
    ;;
-qgis-pr)
-    name="QGIS"
-    type="dmg"
-    downloadURL="https://download.qgis.org/downloads/macos/qgis-macos-pr.dmg"
-    appNewVersion="$(curl -fs "https://www.qgis.org/da/_static/documentation_options.js" | grep -i version | cut -d "'" -f2)"
-    expectedTeamID="4F7N4UDA22"
-    ;;
 r)
    name="R"
    type="pkg"
@@ -4086,15 +3789,10 @@ ramboxce)
    expectedTeamID="7F292FPD69"
    ;;
 rancherdesktop)
-    name="Rancher Desktop"
+    name="Rancher.Desktop-1.0.0-mac"
    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-      archiveName="Rancher.Desktop-[0-9.]*-mac.aarch64.zip"
-      downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
-    elif [[ $(arch) == "i386" ]]; then
-      archiveName="Rancher.Desktop-[0-9.]*-mac.x86_64.zip"
-      downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
-    fi
+    archiveName="Rancher.Desktop-[0-9.]*-mac.zip"
+    downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
    appNewVersion="$(versionFromGit rancher-sandbox rancher-desktop)"
    expectedTeamID="2Q6FHJR3H3"
    appName="Rancher Desktop.app"
@@ -4117,15 +3815,14 @@ redeye)
 remotedesktopmanagerenterprise)
    name="Remote Desktop Manager"
    type="dmg"
-    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
    expectedTeamID="N592S9ASDB"
-    blockingProcesses=( "$name" )
    ;;
 remotedesktopmanagerfree)
    name="Remote Desktop Manager Free"
    type="dmg"
-    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
    expectedTeamID="N592S9ASDB"
    ;;
@@ -4166,15 +3863,11 @@ ricohpsprinters)
    ;;
 ringcentralapp)
    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-    name="Ringcentral"
-    type="pkg"
-    if [[ $(arch) != "i386" ]]; then
-        downloadURL="https://app.ringcentral.com/download/RingCentral-arm64.pkg"
-    else
-        downloadURL="https://app.ringcentral.com/download/RingCentral.pkg"
-    fi
+    name="Glip"
+    type="dmg"
+    downloadURL="https://downloads.ringcentral.com/glip/rc/GlipForMac"
    expectedTeamID="M932RC5J66"
-    blockingProcesses=( "Ringcentral" )
+    blockingProcesses=( "Glip" )
    ;;
 ringcentralclassicapp)
    name="Glip"
@@ -4304,13 +3997,6 @@ shield)
    appNewVersion=$(versionFromGit theevilbit Shield)
    expectedTeamID="33YRLYRBYV"
    ;;
-shottr)
-    name="Shottr"
-    type="dmg"
-    downloadURL="https://shottr.cc/dl/Shottr-1.5.3.dmg"
-    appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
-    expectedTeamID="2Y683PRQWN"
-    ;;
 sidekick)
    name="Sidekick"
    type="dmg"
@@ -4352,7 +4038,7 @@ sizeup)
 sketch)
    name="Sketch"
    type="zip"
-    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | tr '"' "\n" | grep -E "https.*.zip")
+    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g')
    appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page
    expectedTeamID="WUGMZZ5K46"
    ;;
@@ -4370,18 +4056,6 @@ skype)
    expectedTeamID="AL798K98FX"
    Company="Microsoft"
    ;;
-slab)
-    name="Slab"
-    type="dmg"
-    if [[ $(arch) == i386 ]]; then
-       archiveName="Slab-[0-9.]*-darwin-x64.dmg"
-    elif [[ $(arch) == arm64 ]]; then
-       archiveName="Slab-[0-9.]*-darwin-arm64.dmg"
-    fi
-    downloadURL=$(downloadURLFromGit slab desktop-releases)
-    appNewVersion=$(versionFromGit slab desktop-releases)
-    expectedTeamID="Q67SW996Z5"
-    ;;
 slack)
    name="Slack"
    type="dmg"
@@ -4401,32 +4075,11 @@ smartgit)
    expectedTeamID="PHMY45PTNW"
    ;;
 snagit|\
-snagit2022)
-    name="Snagit 2022"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2022" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2022" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
-snagit2019)
-    name="Snagit 2019"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2019" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
+snagit2021|\
 snagit2020)
-    name="Snagit 2020"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2020" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
-snagit2021)
    name="Snagit 2021"
    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2021" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
+    downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg"
    expectedTeamID="7TQL462TU8"
    ;;
 snapgeneviewer)
@@ -4436,15 +4089,6 @@ snapgeneviewer)
    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr '/' '\n' | grep -i "dmg" | sed -E 's/[a-zA-Z_]*_([0-9.]*)_mac\.dmg/\1/g' )
    expectedTeamID="WVCV9Q8Y78"
    ;;
-sonobus)
-    name="Sonobus"
-    type="pkgInDmg"
-    html_page_source="$(curl -fs 'https://www.sonobus.net')"
-    downloadFile="$(echo "${html_page_source}" | xmllint --html --xpath "string(//a[contains(@href, 'mac.dmg')]/@href)" - 2> /dev/null)"
-    downloadURL="https://www.sonobus.net/$downloadFile"
-    appNewVersion="$(echo "${downloadFile}" | sed 's/releases\/sonobus-//' | sed 's/\-mac.dmg//' )"
-    expectedTeamID="XCS435894D"
-    ;;
 sonos|\
 sonoss1)
    # credit: Erik Stam (@erikstam)
@@ -4596,15 +4240,8 @@ tageditor)
 talkdeskcallbar)
    name="Callbar"
    type="dmg"
-    appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p')
-    downloadURL=https://downloadcallbar.talkdesk.com/Callbar-${appNewVersion}.dmg
-    expectedTeamID="YGGJX44TB8"
-    ;;
-talkdeskcxcloud)
-    name="Talkdesk"
-    type="dmg"
-    appNewVersion=$(curl -fs https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json | sed -n -e 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p' | head -n 1)
-    downloadURL="https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-${appNewVersion}.dmg"
+    downloadURL=https://downloadcallbar.talkdesk.com/Callbar-$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p').dmg
+    appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p')
    expectedTeamID="YGGJX44TB8"
    ;;
 taskpaper)
@@ -4698,31 +4335,6 @@ thunderbird)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( thunderbird )
    ;;
-thunderbird_intl)
-    # This label will try to figure out the selected language of the user,
-    # and install corrosponding version of Thunderbird
-    name="Thunderbird"
-    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
-    printlog "Found language $userLanguage to be used for $name."
-    releaseURL="https://ftp.mozilla.org/pub/thunderbird/releases/latest/README.txt"
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
-        if [ ${#userLanguage} -eq 2 ]; then
-            break
-        fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx"
-    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}')
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( thunderbird )
-    ;;
 tidal)
    name="TIDAL"
    type="dmg"
@@ -4781,14 +4393,6 @@ typora)
    appNewVersion=$(curl -fs "https://www.typora.io/download/dev_update.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | cut -d '"' -f2)
    expectedTeamID="9HWK5273G4"
    ;;
-ultimakercura)
-    name="Ultimaker Cura"
-    type="dmg"
-    downloadURL="$(downloadURLFromGit Ultimaker Cura)"
-    archiveName="Ultimaker_Cura-[0-9].*-Darwin.dmg"
-    appNewVersion=$(versionFromGit Ultimaker Cura )
-    expectedTeamID="V4B3JXRRQS"
-    ;;
 umbrellaroamingclient)
    # credit: Tadayuki Onishi (@kenchan0130)
    name="Umbrella Roaming Client"
@@ -4810,14 +4414,6 @@ universaltypeclient)
    downloadURL=https://bin.extensis.com/$( curl -fs https://www.extensis.com/support/universal-type-server-7/ | grep -o "UTC-[0-9].*M.zip" )
    expectedTeamID="J6MMHGD9D6"
    ;;
-unnaturalscrollwheels)
-    name="UnnaturalScrollWheels"
-    type="dmg"
-    downloadURL="$(downloadURLFromGit ther0n UnnaturalScrollWheels)"
-    appNewVersion="$(versionFromGit ther0n UnnaturalScrollWheels)"
-    expectedTeamID="D6H5W2T379"
-    blockingProcesses=( UnnaturalScrollWheels )
-    ;;
 utm)
    name="UTM"
    type="dmg"
@@ -4945,12 +4541,6 @@ webexmeetings)
    #blockingProcessesMaxCPU="5"
    blockingProcesses=( Webex )
    ;;
-wechat)
-    name="WeChat"
-    type="dmg"
-    downloadURL="https://dldir1.qq.com/weixin/mac/WeChatMac.dmg"
-    expectedTeamID="5A4RE8SF68"
-    ;;
 whatsapp)
    name="WhatsApp"
    type="dmg"
@@ -5006,15 +4596,6 @@ xeroxphaser7800)
    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"
    ;;
-xeroxworkcentre7800)
-    name="XeroxWorkCentre"
-    type="pkgInDmg"
-    appCustomVersion(){ lpinfo -m | grep 783 | tail -n 1 | awk -F ', ' '{print $2}' }
-    appNewVersion=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | grep .dmg | head -n 1 | awk -F '_' '{print $2}' )
-    downloadURL=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg" )
-    expectedTeamID="G59Y3XFNFR"
-    blockingProcesses=( NONE )
-;;
 xink)
    name="Xink"
    type="pkg"
@@ -5079,14 +4660,6 @@ zohoworkdrive)
    downloadURL=$(echo "$lines" | grep -i "files-accl.zohopublic.com")$(echo "$lines" | grep -i -A17 "files-accl.zohopublic.com" | grep -i -A2 macintosh | tail -1)
    expectedTeamID="TZ824L8Y37"
    ;;
-zohoworkdrivegenie)
-    name="Zoho WorkDrive Genie"
-    type="dmg"
-    # https://www.zoho.com/workdrive/genie.html
-    downloadURL="https://www.zoho.com/workdrive/downloads/edit-tool/Zoho_WorkDrive_Genie.dmg"
-    CLIInstaller="Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie"
-    expectedTeamID="TZ824L8Y37"
-    ;;
 zohoworkdrivetruesync)
 # Using this label expects you to agree to these:
 # License Areemant: https://www.zoho.com/workdrive/zohoworkdrive-license-agreement.html
--- a/Labels.txt
+++ b/Labels.txt
@@ -1,5 +1,4 @@
 1password7
-1password8
 1passwordcli
 4kvideodownloader
 8x8
@@ -21,7 +20,6 @@ amazonchime
 amazoncorretto8jdk
 amazonworkspaces
 androidfiletransfer
-androidstudio
 anydesk
 apparency
 appcleaner
@@ -35,7 +33,6 @@ aquaskk
 arq7
 asana
 atext
-atextlegacy
 atom
 audacity
 authydesktop
@@ -67,9 +64,6 @@ calcservice
 calibre
 camostudio
 camtasia
-camtasia2019
-camtasia2020
-camtasia2021
 canva
 chatwork
 cisdem-documentreader
@@ -79,14 +73,11 @@ clickshare
 clipy
 closeio
 cloudya
-clue
-cluefull
 code42
 coderunner
 colourcontrastanalyser
 cormorant
 craftmanager
-craftmanagerforsketch
 cryptomator
 cyberduck
 daisydisk
@@ -103,17 +94,13 @@ dialog
 dialpad
 discord
 diskspace
-displaylinkmanager
 docker
 dockutil
-drawio
 drift
 dropbox
-duckduckgo
 easeusdatarecoverywizard
 easyfind
 egnyte
-egnytewebedit
 element
 eraseinstall
 eshareosx
@@ -126,7 +113,6 @@ fastscripts
 favro
 ferdi
 figma
-filezilla
 findanyfile
 firefox
 firefox_da
@@ -135,11 +121,8 @@ firefoxesr
 firefoxesr_intl
 firefoxesrpkg
 firefoxpkg
-firefoxpkg_intl
 flowjo
 flux
-flycut
-fontexplorer
 front
 fsmonitor
 gimp
@@ -167,14 +150,10 @@ hazel
 houdahspot
 hpeasyadmin
 hpeasystart
-hype
 hyper
 ibarcoder
 icons
-idrive
-idrivethin
 iina
-imageoptim
 imazingprofileeditor
 inkscape
 insomnia
@@ -213,8 +192,6 @@ lastpass
 launchbar
 lexarrecoverytool
 libreoffice
-linear
-logioptions
 logitechoptions
 logseq
 loom
@@ -224,7 +201,6 @@ lulu
 macadminspython
 maccyapp
 macfuse
-macoslaps
 macports
 malwarebytes
 marathon
@@ -256,8 +232,6 @@ microsoftteams
 microsoftvisualstudiocode
 microsoftword
 microsoftyammer
-mightymike
-mindmanager
 miro
 mobikinassistantforandroid
 mochakeyboard
@@ -302,7 +276,6 @@ paretosecurity
 parsec
 pdfsam
 perimeter81
-pika
 pitch
 plantronicshub
 platypus
@@ -314,12 +287,10 @@ privileges
 proctortrack
 promiseutility
 promiseutilityr
-propresenter7
 protonvpn
 proxyman
 pycharmce
 pymol
-qgis-pr
 r
 ramboxce
 rancherdesktop
@@ -351,7 +322,6 @@ secretive
 sequelpro
 sfsymbols
 shield
-shottr
 sidekick
 signal
 silnite
@@ -360,16 +330,12 @@ sizeup
 sketch
 sketchupviewer
 skype
-slab
 slack
 smartgit
 snagit
-snagit2019
 snagit2020
 snagit2021
-snagit2022
 snapgeneviewer
-sonobus
 sonos
 sonoss1
 sonoss2
@@ -392,7 +358,6 @@ tableaupublic
 tableaureader
 tageditor
 talkdeskcallbar
-talkdeskcxcloud
 taskpaper
 teamviewer
 teamviewerhost
@@ -405,7 +370,6 @@ textmate
 theunarchiver
 things
 thunderbird
-thunderbird_intl
 tidal
 toggltrack
 tom4aconverter
@@ -414,11 +378,9 @@ trex
 tunnelbear
 tunnelblick
 typora
-ultimakercura
 umbrellaroamingclient
 uniconverter
 universaltypeclient
-unnaturalscrollwheels
 utm
 vagrant
 vanilla
@@ -436,7 +398,6 @@ wallyezflash
 webex
 webexmeetings
 webexteams
-wechat
 whatsapp
 wickrme
 wickrpro
@@ -444,7 +405,6 @@ wireshark
 wordservice
 wwdc
 xeroxphaser7800
-xeroxworkcentre7800
 xink
 xmenu
 xquartz
@@ -453,7 +413,6 @@ yubikeymanagerqt
 zappy
 zeplin
 zohoworkdrive
-zohoworkdrivegenie
 zohoworkdrivetruesync
 zoom
 zoomclient
--- a/script.sh
+++ b/script.sh
@@ -5,28 +5,8 @@ what="brave" # enter the software to install
 # To be used as a script sent out from a MDM.
 # Fill the variable "what" above with a label.
 # Script will run this label.
-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
-######################################################################
-# Parameters for reinstall/initial install (owner root:wheel):
-#   "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1"
-# Parameters for Self Service installed app:
-#   "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all"
-# Parameters for security important apps, like browsers (run automaticaly every day):
-#   "BLOCKING_PROCESS_ACTION=tell_user_then_kill"
-# Update of service apps (run automatically):
-#   "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent"
-parameters="BLOCKING_PROCESS_ACTION=tell_user_then_kill NOTIFY=all"
 ###############################################

-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi
-
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
 caffeinatepid=$!
@@ -36,14 +16,18 @@ caffexit () {
    exit $1
 }

-cmdOutput="$(${destFile} ${what} LOGO=$LOGO $parameters LOGGING=WARN || true)"
-# Check result
-exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
-if [[ ${exitStatus} -ne 0 ]] ; then
-    echo -e "Error installing ${what}. Exit code ${exitStatus}"
-    #echo "$cmdOutput"
-    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-    echo "$errorOutput"
+# Verify that Installomator has been installed
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    caffexit 99
+fi
+
+${destFile} ${what} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force
+if [ $? != 0 ]; then
+# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
    echo "Error installing ${what}. Exit code $?"
    caffexit $?
 fi
--- a/MDM/App-loop
+++ b/MDM/App-loop
@@ -1,31 +1,11 @@
 #!/bin/zsh
 # Installation using Installomator
-whatList="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal" # enter the software to install separated with spaces
+what="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal" # enter the software to install separated with spaces

 # To be used as a script sent out from a MDM.
-# Fill the variable "whatList" above with labels separated by space " ".
+# Fill the variable "what" above with labels separated by space " ".
 # Script will loop through these labels.
-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
 ######################################################################
-# Parameters for reinstall/initial install (owner root:wheel):
-#   "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1"
-# Parameters for Self Service installed app:
-#   "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all"
-# Parameters for security important apps, like browsers (run automaticaly every day):
-#   "BLOCKING_PROCESS_ACTION=tell_user_then_kill"
-# Update of service apps (run automatically):
-#   "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent"
-parameters="BLOCKING_PROCESS_ACTION=tell_user NOTIFY=all"
-######################################################################
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi

 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -39,17 +19,21 @@ caffexit () {
 # Count errors
 errorCount=0

-for what in $whatList; do
-    #echo $what
-    # Install software using Installomator
-    cmdOutput="$(${destFile} ${what} LOGO=$LOGO $parameters LOGGING=WARN || true)"
-    # Check result
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
-    if [[ ${exitStatus} -ne 0 ]] ; then
-        echo -e "Error installing ${what}. Exit code ${exitStatus}"
-        #echo "$cmdOutput"
-        errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-        echo "$errorOutput"
+# Verify that Installomator has been installed
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    caffexit 99
+fi
+
+for item in $what; do
+    #echo $item
+    ${destFile} ${item} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force
+    if [ $? != 0 ]; then
+    # This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
+        echo "[$(DATE)] Error installing ${item}. Exit code $?"
        let errorCount++
    fi
 done
--- a/MDM/Installomator
+++ b/MDM/Installomator
@@ -1,18 +1,9 @@
 #!/bin/bash
 # Updating Installomator
 # Usefull to push out after deployment if earlier version was deployed in DEP profile
+# Currently script uses valuesfromarguments as a label is not included before next release, so this can be used to install to version 0.7

 what="installomator" # enter the software to install
-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi

 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -23,19 +14,30 @@ caffexit () {
    exit $1
 }

-# Install software using Installomator
-cmdOutput="$(${destFile} ${what} LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent LOGGING=req || true)"
+# Verify that Installomator has been installed
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    caffexit 99
+fi

-# Check result
-exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
-if [[ ${exitStatus} -eq 0 ]] ; then
-    echo -e "${what} succesfully installed.\n"
-else
-    echo -e "Error installing ${what}. Exit code ${exitStatus}\n"
-    #echo "$cmdOutput"
-    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-    echo "$errorOutput"
-   	caffexit $exitStatus
+${destFile} valuesfromarguments\
+            name=Installomator \
+            type=pkg \
+            packageID=com.scriptingosx.Installomator \
+            downloadURL=https://github.com/Installomator/Installomator/releases/download/v0.7release/Installomator-0.7.0.pkg \
+            appNewVersion=0.7 \
+            expectedTeamID=JME5BW3F3R \
+            BLOCKING_PROCESS_ACTION=ignore \
+            NOTIFY=silent
+
+# ${destFile} ${what} BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent
+if [ $? != 0 ]; then
+# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
+    echo "Error installing ${what}. Exit code $?"
+    caffexit $?
 fi

 echo "[$(DATE)][LOG-END]"
--- a/CustomSoftware.sh
+++ b/CustomSoftware.sh
@@ -5,34 +5,15 @@

 # Mark: Installation script
 # Just click “Add” to autogenerate the installer script line by clicking the “Add”-button next to the Installer PKG, replace with first line below
-/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (9.1.0)/Installomator-9.1.pkg" -target /
+/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (0.7.0)/Installomator-0.7.0.pkg" -target /

 # Installation using Installomator
-whatList="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed  separated with spaces
+what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed  separated with spaces

 # To be used as a script sent out from a MDM.
-# Fill the variable "whatList" above with labels separated by space " ".
+# Fill the variable "what" above with labels separated by space " ".
 # Script will loop through these labels and exit with number of errors.
 ######################################################################
-# Parameters for reinstall/initial install (owner root:wheel):
-#   "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1"
-# Parameters for Self Service installed app:
-#   "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all"
-# Parameters for security important apps, like browsers (run automaticaly every day):
-#   "BLOCKING_PROCESS_ACTION=tell_user_then_kill"
-# Update of service apps (run automatically):
-#   "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent"
-parameters="BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes"
-######################################################################
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi

 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -46,17 +27,21 @@ caffexit () {
 # Count errors
 errorCount=0

-for what in $whatList; do
-    #echo $what
-    # Install software using Installomator
-    cmdOutput="$(${destFile} ${what} LOGO=addigy $parameters || true)"
-    # Check result
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
-    if [[ ${exitStatus} -ne 0 ]] ; then
-        echo -e "Error installing ${what}. Exit code ${exitStatus}"
-        #echo "$cmdOutput"
-        errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-        echo "$errorOutput"
+# Verify that Installomator has been installed
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    caffexit 99
+fi
+
+for item in $what; do
+    #echo $item
+    ${destFile} ${item} LOGO=addigy NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill #INSTALL=force
+    if [ $? != 0 ]; then
+    # Error handling
+        echo "[$(DATE)] Error installing ${item}. Exit code $?"
        let errorCount++
    fi
 done
@@ -71,7 +56,7 @@ caffexit $errorCount
 # Install on success
 # Remember to fill out the correct “TARGET_VERSION” and “PKG_ID”, and click "Install on succes".
 PKG_ID="com.scriptingosx.Installomator"
-TARGET_VERSION="9.1"
+TARGET_VERSION="8.0"

 vercomp () {
    if [[ $1 == $2 ]]; then
--- a/MDM/MDMMosyle
+++ b/MDM/MDMMosyle
@@ -1,11 +1,10 @@
 PKG_ID="com.scriptingosx.Installomator"
-TARGET_VERSION="9.1"
+TARGET_VERSION="8.0"
 URLDOWNLOAD="%MosyleCDNFile:blah-blah-blah%"
 ######################################################################
-# Installation using Installomator (enter the software to install separated with spaces in the "whatList"-variable)
-whatList="handbrake theunarchiver microsoftoffice365"
+# Installation using Installomator (enter the software to install separated with spaces in the "what"-variable)
+what="handbrake theunarchiver microsoftoffice365"
 # Covered by Mosyle Catalog: "brave firefox googlechrome microsoftedge microsoftteams signal sublimetext vlc webex zoom" among others
-LOGO="mosyleb" # or "mosylem"
 ######################################################################

 ## Mark: Code here
@@ -57,17 +56,12 @@ if [ ! -e "${destFile}" ]; then
    caffexit 99
 fi

-for what in $whatList; do
+for item in $what; do
    #echo $item
-    # Install software using Installomator
-    cmdOutput="$(${destFile} ${what} LOGO=$LOGO NOTIFY=all BLOCKING_PROCESS_ACTION=tell_user || true)" # NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force
-    # Check result
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
-    if [[ ${exitStatus} -ne 0 ]] ; then
-        echo "Error installing ${what}. Exit code ${exitStatus}"
-        #echo "$cmdOutput"
-        errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-        echo "$errorOutput"
+    ${destFile} ${item} LOGO=mosyle NOTIFY=all BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill #INSTALL=force
+    if [ $? != 0 ]; then
+    # Error handling
+        echo "[$(DATE)] Error installing ${item}. Exit code $?"
        let errorCount++
    fi
 done
--- a/valuesfromarguments.sh
+++ b/valuesfromarguments.sh
@@ -1,20 +1,8 @@
 #!/bin/bash
-# Software
-
 # Installation using Installomator
 # Example of installing software using valuesfromarguments to install a custom software

-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
-###############################################
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi
+what="valuesfromarguments" # enter the software to install

 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -25,31 +13,29 @@ caffexit () {
    exit $1
 }

-# Variables to calculate
-downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip"
-appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath -e '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2)
+# Verify that Installomator has been installed
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    caffexit 99
+fi

-# Install software using Installomator
-cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
-    name=CraftManager \
-    type=zip \
-    downloadURL=$downloadURL \
-    appNewVersion=$appNewVersion \
-    expectedTeamID=VRXQSNCL5W \
-    BLOCKING_PROCESS_ACTION=prompt_user \
-    LOGGING=REQ \
-    NOTIFY=all || true)"
+${destFile} valuesfromarguments \
+            name=\"Zoho\ WorkDrive\" \
+            type=dmg \
+            downloadURL=https://files-accl.zohopublic.com/public/wdbin/download/46f971e4fc4a32b68ad5d7dade38a7d2 \
+            appNewVersion=2.6.25 \
+            expectedTeamID=TZ824L8Y37 \
+            BLOCKING_PROCESS_ACTION=quit \
+            NOTIFY=all

-# Check result
-exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
-if [[ ${exitStatus} -eq 0 ]] ; then
-    echo -e "${what} succesfully installed.\n"
-else
-    echo -e "Error installing ${what}. Exit code ${exitStatus}\n"
-    #printlog "$cmdOutput"
-    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-    echo "$errorOutput"
-   	caffexit $exitStatus
+# ${destFile} ${what} BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent
+if [ $? != 0 ]; then
+# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
+    echo "Error installing ${what}. Exit code $?"
+    caffexit $?
 fi

 echo "[$(DATE)][LOG-END]"
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@

 _The one installer script to rule them all._

-![](https://img.shields.io/github/v/release/Installomator/Installomator)&nbsp;![](https://img.shields.io/github/downloads/Installomator/Installomator/latest/total)&nbsp;![](https://img.shields.io/badge/macOS-10.14%2B-success)&nbsp;![](https://img.shields.io/github/license/Installomator/Installomator)
+![](https://img.shields.io/github/v/release/scriptingosx/Installomator)&nbsp;![](https://img.shields.io/github/downloads/scriptingosx/Installomator/latest/total)&nbsp;![](https://img.shields.io/badge/macOS-10.14%2B-success)&nbsp;![](https://img.shields.io/github/license/scriptingosx/Installomator)

 This script is in the “we find it useful, it is working for us” stage.

@@ -13,12 +13,12 @@ We have put a lot of work into making it stable and safe, but we cannot - of cou
 ## Authors

 Intallomator was originally inspired by the download scripts from William Smith and Sander Schram, and created by:
- [Armin Briegel - @scriptingosx](https://github.com/scriptingosx)
+    Armin Briegel - @scriptingosx

-Later on a few more members came on the project:
- Isaac Ordonez - @issacatmann
- [Søren Theilgaard - @Theile](https://github.com/Theile)
- [Adam Codega - @acodega](https://github.com/acodega)
+Later on a few more contributers came on the project:
+    Isaac Ordonez - @issacatmann
+    Søren Theilgaard - @Theile
+    Adam Codega - @acodega

 And with numerous contributions from many others.

--- a/fragments/disabled/mightymike.sh
+++ b/fragments/disabled/mightymike.sh
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -242,8 +242,8 @@ getAppVersion() {
 #        printlog "App(s) found: ${applist}" DEBUG
 #        applist=$(mdfind "kind:application AND name:$appName" -0 )
    fi
-    if [[ -z $applist ]]; then
-        printlog "No previous app found" WARN
+    if [[ -z applist ]]; then
+        printlog "No previous app found" INFO
    else
        printlog "App(s) found: ${applist}" INFO
    fi
@@ -265,7 +265,7 @@ getAppVersion() {
            if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then
                printlog "Installed $appName is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace."
                if [[ $IGNORE_APP_STORE_APPS == "yes" ]]; then
-                    printlog "Replacing App Store apps, no matter the version" WARN
+                    printlog "Replacing App Store apps, no matter the version"
                    appversion=0
                else
                    cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR
--- a/fragments/header.sh
+++ b/fragments/header.sh
@@ -238,7 +238,7 @@ IGNORE_DND_APPS=""
 # - updateToolArguments:
 #   When Installomator detects an existing installation of the application,
 #   and the updateTool variable is set
-#       $updateTool $updateArguments
+#      $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 on various Microsoft labels
@@ -253,7 +253,7 @@ IGNORE_DND_APPS=""
 #   We need to define `name` for the installed app (to be version checked), as well as
 #   `installerTool` for the installer app (if named differently than `name`. Installomator
 #   will add the path to the folder/disk image with the binary, and it will be called like this:
-#       $CLIInstaller $CLIArguments
+     `$CLIInstaller $CLIArguments`
 #   For most installations `CLIInstaller` should contain the `installerTool` for the CLI call
 #   (if it’s the same).
 #   We can support a whole range of other software titles by implementing this.
--- a/fragments/labels/1password8.sh
+++ b/fragments/labels/1password8.sh
@@ -1,15 +0,0 @@
-1password8)
-    name="1Password 8"
-    appName="1Password.app"
-    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-        archiveName="1Password-latest-aarch64.zip"
-        downloadURL="https://downloads.1password.com/mac/1Password-latest-aarch64.zip"
-    elif [[ $(arch) == "i386" ]]; then
-        archiveName="1Password-latest-x86_64.zip"
-        downloadURL="https://downloads.1password.com/mac/1Password-latest-x86_64.zip"
-    fi
-    expectedTeamID="2BUA8C4S2C"
-    blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" )
-    #forcefulQuit=YES
-    ;;
--- a/fragments/labels/adobereaderdc-update.sh
+++ b/fragments/labels/adobereaderdc-update.sh
@@ -1,7 +1,7 @@
 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 https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
+    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"
--- a/fragments/labels/adobereaderdc.sh
+++ b/fragments/labels/adobereaderdc.sh
@@ -3,8 +3,7 @@ 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)
-    downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
+    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"
--- a/fragments/labels/amazoncorretto8jdk.sh
+++ b/fragments/labels/amazoncorretto8jdk.sh
@@ -1,12 +1,7 @@
 amazoncorretto8jdk)
 name="Amazon Corretto 8 JDK"
 type="pkg"
-	if [[ $(arch) == "arm64" ]]; then
-		downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-aarch64-macos-jdk.pkg"
-		appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
-	elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg"
-        appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
-    fi
+	downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg"
+	appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
 expectedTeamID="94KV3E626L"
 ;;
--- a/fragments/labels/androidstudio.sh
+++ b/fragments/labels/androidstudio.sh
@@ -1,13 +0,0 @@
-androidstudio)
-    name="Android Studio"
-    type="dmg"
-    if [[ $(arch) == arm64 ]]; then
-	 downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i arm.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1)
-	 appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' )
-    elif [[ $(arch) == i386 ]]; then
-     downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i mac.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1)
-	 appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' )
-	fi
-    expectedTeamID="EQHXZ8M8AV"
-    blockingProcesses=( androidstudio )
-    ;;
--- a/fragments/labels/atextlegacy.sh
+++ b/fragments/labels/atextlegacy.sh
@@ -1,7 +0,0 @@
-atextlegacy)
-     # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-     name="aText"
-     type="dmg"
-     downloadURL="https://trankynam.com/atext/downloads/aTextLegacy.dmg"
-     expectedTeamID="KHEMQ2FD9E"
-     ;;
--- a/fragments/labels/camtasia.sh
+++ b/fragments/labels/camtasia.sh
@@ -1,8 +1,6 @@
-camtasia|\
-camtasia2021)
-    name="Camtasia 2021"
+camtasia)
+    name="Camtasia 2020"
    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2021" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
+    downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg
    expectedTeamID="7TQL462TU8"
    ;;
--- a/fragments/labels/camtasia2019.sh
+++ b/fragments/labels/camtasia2019.sh
@@ -1,7 +0,0 @@
-camtasia2019)
-    name="Camtasia 2019"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2019" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
--- a/fragments/labels/camtasia2020.sh
+++ b/fragments/labels/camtasia2020.sh
@@ -1,7 +0,0 @@
-camtasia2020)
-    name="Camtasia 2020"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2020" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
--- a/fragments/labels/citrixworkspace.sh
+++ b/fragments/labels/citrixworkspace.sh
@@ -3,6 +3,6 @@ citrixworkspace)
    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 | awk '{print $2}' | cut -d "." -f 1-3)
+    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/clue.sh
+++ b/fragments/labels/clue.sh
@@ -1,9 +0,0 @@
-clue)
-    #For personal use and students
-    name="Clue"
-    type="dmg"
-    downloadURL=$(curl -fsL https://clue.no/en/download | grep "For personal use and students:" | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\..*/\1/g')"
-    versionKey="CFBundleVersion"
-    expectedTeamID="3NX6B9TB2F"
-    ;;
--- a/fragments/labels/cluefull.sh
+++ b/fragments/labels/cluefull.sh
@@ -1,9 +0,0 @@
-cluefull)
-    #For companies and schools
-    name="Clue"
-    type="dmg"
-    downloadURL=$(curl -fsL https://clue.no/en/download | grep "For companies and schools:" | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\F.*/\1/g')"
-    versionKey="CFBundleVersion"
-    expectedTeamID="3NX6B9TB2F"
-    ;;
--- a/fragments/labels/craftmanagerforsketch.sh
+++ b/fragments/labels/craftmanagerforsketch.sh
@@ -1,7 +0,0 @@
-craftmanagerforsketch)
-    name="CraftManager"
-    type="zip"
-    downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip"
-    appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2)
-    expectedTeamID="VRXQSNCL5W"
-    ;;
--- a/fragments/labels/displaylinkmanager.sh
+++ b/fragments/labels/displaylinkmanager.sh
@@ -1,8 +0,0 @@
-displaylinkmanager)
-    name="DisplayLink Manager"
-    type="pkg"
-    #packageID="com.displaylink.displaylinkmanagerapp"
-    downloadURL=https://www.synaptics.com$(redirect=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep 'class="download-link">Download' | head -n 1 | sed 's/.*href="//' | sed 's/".*//') && curl -sfL "https://www.synaptics.com$redirect" | grep Accept | head -n 1 | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep "Release:" | head -n 1 | cut -d ' ' -f2)
-    expectedTeamID="73YQY62QM3"
-    ;;
--- a/fragments/labels/drawio.sh
+++ b/fragments/labels/drawio.sh
@@ -1,9 +0,0 @@
-drawio)
-    name="draw.io"
-    type="dmg"
-    archiveName="draw.io-universal-[0-9.]*.dmg"
-    downloadURL="$(downloadURLFromGit jgraph drawio-desktop)"
-    appNewVersion="$(versionFromGit jgraph drawio-desktop)"
-    expectedTeamID="UZEUFB4N53"
-    blockingProcesses=( draw.io )
-    ;;
--- a/fragments/labels/dropbox.sh
+++ b/fragments/labels/dropbox.sh
@@ -2,6 +2,5 @@ dropbox)
    name="Dropbox"
    type="dmg"
    downloadURL="https://www.dropbox.com/download?plat=mac&full=1"
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | sed -E 's/.*%20([0-9.]*)\.dmg/\1/g')
    expectedTeamID="G7HH3F8CAK"
    ;;
--- a/fragments/labels/duckduckgo.sh
+++ b/fragments/labels/duckduckgo.sh
@@ -1,10 +0,0 @@
-duckduckgo)
-    name="DuckDuckGo"
-    type="dmg"
-    #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg"
-    #downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2)
-    downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2)
-    #appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2)
-    appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/sparkle:shortVersionString)[1]' 2>/dev/null | cut -d ">" -f2 | cut -d "<" -f1)
-    expectedTeamID="HKE973VLUW"
-    ;;
--- a/fragments/labels/egnytewebedit.sh
+++ b/fragments/labels/egnytewebedit.sh
@@ -1,9 +0,0 @@
-egnytewebedit)
-    name="EgnyteWebEdit"
-    type="pkg"
-    downloadURL="https://egnyte-cdn.egnyte.com/webedit/mac/en-us/latest/EgnyteWebEdit.pkg"
-    expectedTeamID="FELUD555VC"
-    appName="Egnyte WebEdit.app"
-    blockingProcesses=( NONE )
-    ;;
-    
--- a/fragments/labels/filezilla.sh
+++ b/fragments/labels/filezilla.sh
@@ -1,10 +0,0 @@
-filezilla)
-    name="FileZilla"
-    type="tbz"
-    packageID="org.filezilla-project.filezilla"
-    downloadURL=$(curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '"' '{print $2}' )
-    appNewVersion=$( curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '_' '{print $2}' )
-    expectedTeamID="5VPGKXL75N"
-    blockingProcesses=( NONE )
-    ;;
-
--- a/fragments/labels/firefox.sh
+++ b/fragments/labels/firefox.sh
@@ -5,5 +5,4 @@ firefox)
    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
--- a/fragments/labels/firefox_da.sh
+++ b/fragments/labels/firefox_da.sh
@@ -5,5 +5,4 @@ firefox_da)
    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox, firefox_da and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
--- a/fragments/labels/firefox_intl.sh
+++ b/fragments/labels/firefox_intl.sh
@@ -1,26 +1,23 @@
 firefox_intl)
-    # This label will try to figure out the selected language of the user,
+    # This label will try to figure out the selected language of the user, 
    # and install corrosponding version of Firefox
    name="Firefox"
    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
-    printlog "Found language $userLanguage to be used for $name."
-    releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt"
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
-        if [ ${#userLanguage} -eq 2 ]; then
-            break
+    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
+    printlog "Found language $userLanguage to be used for Firefox."
+    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
+        userLanguage=$(echo $userLanguage | cut -c 1-2)
+        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
+            userLanguage="en_US"
        fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx"
    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}')
+    printlog "Using language $userLanguage for download."
+    downloadURL="https://download.mozilla.org/?product=firefox-latest&amp;os=osx&amp;lang=$userLanguage"
+    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
+        printlog "Download not found for that language. Using en-US"
+        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
+    fi
+    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
--- a/fragments/labels/firefoxesr_intl.sh
+++ b/fragments/labels/firefoxesr_intl.sh
@@ -1,26 +1,24 @@
 firefoxesr_intl)
-    # This label will try to figure out the selected language of the user,
+    # This label will try to figure out the selected language of the user, 
    # and install corrosponding version of Firefox ESR
    name="Firefox"
    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
-    printlog "Found language $userLanguage to be used for $name."
-    releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt"
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
-        if [ ${#userLanguage} -eq 2 ]; then
-            break
+    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
+    printlog "Found language $userLanguage to be used for Firefox."
+    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep -o "=$userLanguage"; then
+        userLanguage=$(echo $userLanguage | cut -c 1-2)
+        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep "=$userLanguage"; then
+            userLanguage="en_US"
        fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx"
    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"esr/"); print a[1]}')
+    printlog "Using language $userLanguage for download."
+    downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage"
+    # https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US
+    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
+        printlog "Download not found for that language. Using en-US"
+        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
+    fi
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g')
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
    ;;
--- a/fragments/labels/firefoxpkg.sh
+++ b/fragments/labels/firefoxpkg.sh
@@ -2,7 +2,6 @@ firefoxpkg)
    name="Firefox"
    type="pkg"
    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    ;;
--- a/fragments/labels/firefoxpkg_intl.sh
+++ b/fragments/labels/firefoxpkg_intl.sh
@@ -1,24 +0,0 @@
-firefoxpkg_intl)
-    # This label will try to figure out the selected language of the user,
-    # and install corrosponding version of Firefox ESR
-    name="Firefox"
-    type="pkg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for Firefox." WARN
-    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
-        userLanguage=$(echo $userLanguage | cut -c 1-2)
-        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
-            userLanguage="en_US"
-        fi
-    fi
-    printlog "Using language $userLanguage for download." WARN
-    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=$userLanguage"
-    # https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US
-    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
-        printlog "Download not found for that language. Using en-US" WARN
-        downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    fi
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location | cut -d "/" -f7)
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( firefox )
-    ;;
--- a/fragments/labels/flycut.sh
+++ b/fragments/labels/flycut.sh
@@ -1,8 +0,0 @@
-flycut)
-    name="Flycut"
-    type="zip"
-    archiveName="Flycut.[0-9.]*.zip"
-    downloadURL="$(downloadURLFromGit TermiT Flycut)"
-    appNewVersion=$(versionFromGit TermiT Flycut )
-    expectedTeamID="S8JLSG5ES7"
-;;
--- a/fragments/labels/fontexplorer.sh
+++ b/fragments/labels/fontexplorer.sh
@@ -1,9 +0,0 @@
-fontexplorer)
-    name="FontExplorer X Pro"
-    type="dmg"
-    packageID="com.linotype.FontExplorerX"
-    downloadURL="http://www.fontexplorerx.com/download/free-trial/Mac/"
-    appNewVersion=$( curl -fsL http://fex.linotype.com/update/client/mac/pro/version.plist | grep string | tail -n 1 | sed 's/[^0-9.]//g' )
-    expectedTeamID="2V7G2B7WG4"
-    ;;
-
--- a/fragments/labels/forticlient_ztna.sh
+++ b/fragments/labels/forticlient_ztna.sh
@@ -0,0 +1,9 @@
+forticlient_ztna)
+    name="FortiClient ZTNA"
+    type="pkgInDmg"
+    pkgName="Install.mpkg"
+    packageID="com.fortinet.forticlient."
+    downloadURL="https://links.fortinet.com/forticlient/mac/fabricagent"
+    appNewVersion="$(curl -fsL "$downloadURL" --remote-header-name --remote-name -w "%{url_effective}\n" -r 0-0 | cut -d "_" -f2)"
+    expectedTeamID="AH4XFXJ7DK"
+    ;;
--- a/fragments/labels/googlechrome.sh
+++ b/fragments/labels/googlechrome.sh
@@ -4,5 +4,4 @@ googlechrome)
    downloadURL="https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg"
    appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
    expectedTeamID="EQHXZ8M8AV"
-    printlog "WARNING for ERROR: Label googlechrome should not be used. Instead use googlechromepkg as per recommendations from Google. It's not fully certain that the app actually gets updated here. googlechromepkg will have built in updates and make sure the client is updated in the future." REQ
    ;;
--- a/fragments/labels/googlechromepkg.sh
+++ b/fragments/labels/googlechromepkg.sh
@@ -6,7 +6,6 @@ googlechromepkg)
    # https://support.google.com/chrome/a/answer/9915669
    #
    downloadURL="https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg"
-    appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
    expectedTeamID="EQHXZ8M8AV"
    updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent"
    updateToolArguments=( -runMode oneshot -userInitiated YES )
--- a/fragments/labels/gpgsuite.sh
+++ b/fragments/labels/gpgsuite.sh
@@ -4,7 +4,6 @@ gpgsuite)
    type="pkgInDmg"
    pkgName="Install.pkg"
    downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4)
-    appNewVersion=$(echo $downloadURL | cut -d "-" -f 2 | cut -d "." -f 1-2)
    expectedTeamID="PKV8ZPD836"
    blockingProcesses=( "GPG Keychain" )
    ;;
--- a/fragments/labels/grammarly.sh
+++ b/fragments/labels/grammarly.sh
@@ -1,11 +1,9 @@
 grammarly)
-     name="Grammarly Desktop"
-     type="dmg"
-     packageID="com.grammarly.ProjectLlama"
-     downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-     expectedTeamID="W8F64X92K3"
-     appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4)
-     # appName="Grammarly Installer.app"
-     installerTool="Grammarly Installer.app"
-     CLIInstaller="Grammarly Installer.app/Contents/MacOS/Grammarly Desktop"
-;;
+    name="Grammarly Desktop"
+    type="dmg"
+    packageID="com.grammarly.ProjectLlama"
+    downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
+    expectedTeamID="W8F64X92K3"
+    appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4)
+    appName="Grammarly Installer.app"
+    ;;
--- a/fragments/labels/hype.sh
+++ b/fragments/labels/hype.sh
@@ -1,9 +0,0 @@
-hype)
-    name="Hype4"
-    type="dmg"
-    packageID="com.tumult.Hype4"
-    downloadURL="https://static.tumult.com/hype/download/Hype.dmg"
-    appNewVersion=$( curl -fsL https://tumult.com/hype/download/all/ | grep Ongoing | awk -F '<' '{print $4}' | sed 's/[^0-9.]//g' )
-    expectedTeamID="8J356DM772"
-    blockingProcesses=( NONE )
-    ;;
--- a/fragments/labels/idrive.sh
+++ b/fragments/labels/idrive.sh
@@ -1,9 +0,0 @@
-idrive)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDrive.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*(https.*dmg).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*mac_vernum\=\"Version\ ([0-9.]*).*/\1/g')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;
--- a/fragments/labels/idrivethin.sh
+++ b/fragments/labels/idrivethin.sh
@@ -1,9 +0,0 @@
-idrivethin)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDriveThin.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thinclient-mac([^;]*).*/\1/g' | sed -E 's/.*(https.*dmg).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thin\_mac\_ver\=\"Version\ ([0-9.]*).*/\1/g')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;
--- a/fragments/labels/imageoptim.sh
+++ b/fragments/labels/imageoptim.sh
@@ -1,9 +0,0 @@
-imageoptim)
-    name="imageoptim"
-    type="tbz"
-    packageID="net.pornel.ImageOptim"
-    downloadURL="https://imageoptim.com/ImageOptim.tbz2"
-    appNewVersion=$( curl -fsL https://imageoptim.com/appcast.xml | grep "title" | tail -n 1 | sed 's/[^0-9.]//g' )
-    expectedTeamID="59KZTZA4XR"
-    blockingProcesses=( NONE )
-    ;;
--- a/fragments/labels/linear.sh
+++ b/fragments/labels/linear.sh
@@ -1,15 +0,0 @@
-linear)
-    name="Linear"
-    type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
-        downloadURL="https://desktop.linear.app/mac/dmg/arm64"
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://desktop.linear.app/mac/dmg"
-    fi
-    appNewVersion=$(curl -sIkL $downloadURL | sed -r '/filename=/!d;s/.*filename=(.*)$/\1/' | awk '{print $2}')
-    expectedTeamID="7VZ2S3V9RV"
-    versionKey="CFBundleShortVersionString"
-    appName="Linear.app"
-    blockingProcesses=( "Linear" )
-    ;;
-    
--- a/fragments/labels/logitechoptions.sh
+++ b/fragments/labels/logitechoptions.sh
@@ -1,6 +1,5 @@
-logioptions|\
 logitechoptions)
-    name="Logi Options"
+    name="Logitech Options"
    type="pkgInZip"
    #downloadURL=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip" | head -1)
    downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip"
--- a/fragments/labels/macoslaps.sh
+++ b/fragments/labels/macoslaps.sh
@@ -1,8 +0,0 @@
-macoslaps)
-    name="macOSLAPS"
-    type="pkg"
-    packageID="edu.psu.macOSLAPS"
-    downloadURL="$(downloadURLFromGit joshua-d-miller macOSLAPS)"
-    appNewVersion="$(versionFromGit joshua-d-miller macOSLAPS)"
-    expectedTeamID="9UYK4F9BSM"
-    ;;
--- a/fragments/labels/mindmanager.sh
+++ b/fragments/labels/mindmanager.sh
@@ -1,7 +0,0 @@
-mindmanager)
-    name="MindManager"
-    type="dmg"
-    downloadURL="https://www.mindmanager.com/mm-mac-dmg"
-    appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*_Mac_*([0-9.]*)\..*/\1/g')"
-    expectedTeamID="ZF6ZZ779N5"
-    ;;
--- a/fragments/labels/onlyofficedesktop.sh
+++ b/fragments/labels/onlyofficedesktop.sh
@@ -1,11 +1,6 @@
 onlyofficedesktop)
    name="ONLYOFFICE"
    type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
-    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/arm/distrib/ONLYOFFICE.dmg"
-    elif [[ $(arch) == "i386" ]]; then
-    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/x86_64/distrib/ONLYOFFICE.dmg"
-    fi
-    appNewVersion=$(versionFromGit ONLYOFFICE DesktopEditors)
+    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/distrib/onlyoffice/ONLYOFFICE.dmg"
    expectedTeamID="2WH24U26GJ"
    ;;
--- a/fragments/labels/pika.sh
+++ b/fragments/labels/pika.sh
@@ -1,9 +0,0 @@
-pika)
-    name="Pika"
-    type="dmg"
-    packageID="com.superhighfives.Pika"
-    downloadURL=$(downloadURLFromGit "superhighfives" "pika")
-    appNewVersion=$(versionFromGit "superhighfives" "pika")
-    expectedTeamID="TGHU37N6EX"
-    blockingProcesses=( NONE )
-    ;;
--- a/fragments/labels/postman.sh
+++ b/fragments/labels/postman.sh
@@ -1,12 +1,8 @@
 postman)
+    # credit: Mischa van der Bent
    name="Postman"
    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-    	downloadURL="https://dl.pstmn.io/download/latest/osx_arm64"
-		appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
-	elif [[ $(arch) == "i386" ]]; then
-		downloadURL="https://dl.pstmn.io/download/latest/osx_64"
-		appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
-	fi
+    downloadURL="https://dl.pstmn.io/download/latest/osx"
+    appNewVersion=$(curl -Ifs https://dl.pstmn.io/download/latest/osx | grep "content-disposition:" | sed -n -e 's/^.*Postman-osx-//p' | sed 's/\.zip//' | sed $'s/[^[:print:]\t]//g' )
    expectedTeamID="H7H8Q7M5CK"
    ;;
--- a/fragments/labels/propresenter7.sh
+++ b/fragments/labels/propresenter7.sh
@@ -6,4 +6,4 @@ propresenter7)
    downloadURL=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"downloadUrl":.*?[^\]",' | head -n 1 | cut -d \" -f 4 | sed -e 's/\\//g')
    appNewVersion=$(curl -s "https://api.renewedvision.com/v1/pro/upgrade?platform=macos&osVersion=12&appVersion=771&buildNumber=117899527&includeNotes=false" | grep -Eo '"version":.*?[^\]",' | head -n 1 | cut -d \" -f 4)
    expectedTeamID="97GAAZ6CPX"
-    ;;
+    ;;
--- a/fragments/labels/qgis-pr.sh
+++ b/fragments/labels/qgis-pr.sh
@@ -1,7 +0,0 @@
-qgis-pr)
-    name="QGIS"
-    type="dmg"
-    downloadURL="https://download.qgis.org/downloads/macos/qgis-macos-pr.dmg"
-    appNewVersion="$(curl -fs "https://www.qgis.org/da/_static/documentation_options.js" | grep -i version | cut -d "'" -f2)"
-    expectedTeamID="4F7N4UDA22"
-    ;;
--- a/fragments/labels/rancherdesktop.sh
+++ b/fragments/labels/rancherdesktop.sh
@@ -1,13 +1,8 @@
 rancherdesktop)
-    name="Rancher Desktop"
+    name="Rancher.Desktop-1.0.0-mac"
    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-      archiveName="Rancher.Desktop-[0-9.]*-mac.aarch64.zip"
-      downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
-    elif [[ $(arch) == "i386" ]]; then
-      archiveName="Rancher.Desktop-[0-9.]*-mac.x86_64.zip"
-      downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
-    fi
+    archiveName="Rancher.Desktop-[0-9.]*-mac.zip"
+    downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
    appNewVersion="$(versionFromGit rancher-sandbox rancher-desktop)"
    expectedTeamID="2Q6FHJR3H3"
    appName="Rancher Desktop.app"
--- a/fragments/labels/remotedesktopmanagerenterprise.sh
+++ b/fragments/labels/remotedesktopmanagerenterprise.sh
@@ -1,8 +1,7 @@
 remotedesktopmanagerenterprise)
    name="Remote Desktop Manager"
    type="dmg"
-    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
    expectedTeamID="N592S9ASDB"
-    blockingProcesses=( "$name" )
    ;;
--- a/fragments/labels/remotedesktopmanagerfree.sh
+++ b/fragments/labels/remotedesktopmanagerfree.sh
@@ -1,7 +1,7 @@
 remotedesktopmanagerfree)
    name="Remote Desktop Manager Free"
    type="dmg"
-    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
    expectedTeamID="N592S9ASDB"
    ;;
--- a/fragments/labels/shottr.sh
+++ b/fragments/labels/shottr.sh
@@ -1,7 +0,0 @@
-shottr)
-    name="Shottr"
-    type="dmg"
-    downloadURL="https://shottr.cc/dl/Shottr-1.5.3.dmg"
-    appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
-    expectedTeamID="2Y683PRQWN"
-    ;;
--- a/fragments/labels/sketch.sh
+++ b/fragments/labels/sketch.sh
@@ -1,7 +1,7 @@
 sketch)
    name="Sketch"
    type="zip"
-    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | tr '"' "\n" | grep -E "https.*.zip")
+    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g')
    appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page
    expectedTeamID="WUGMZZ5K46"
    ;;
--- a/fragments/labels/slab.sh
+++ b/fragments/labels/slab.sh
@@ -1,12 +0,0 @@
-slab)
-    name="Slab"
-    type="dmg"
-    if [[ $(arch) == i386 ]]; then
-       archiveName="Slab-[0-9.]*-darwin-x64.dmg"
-    elif [[ $(arch) == arm64 ]]; then
-       archiveName="Slab-[0-9.]*-darwin-arm64.dmg"
-    fi
-    downloadURL=$(downloadURLFromGit slab desktop-releases)
-    appNewVersion=$(versionFromGit slab desktop-releases)
-    expectedTeamID="Q67SW996Z5"
-    ;;
--- a/fragments/labels/snagit.sh
+++ b/fragments/labels/snagit.sh
@@ -1,8 +1,8 @@
 snagit|\
-snagit2022)
-    name="Snagit 2022"
+snagit2021|\
+snagit2020)
+    name="Snagit 2021"
    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2022" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2022" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
+    downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg"
    expectedTeamID="7TQL462TU8"
    ;;
--- a/fragments/labels/snagit2019.sh
+++ b/fragments/labels/snagit2019.sh
@@ -1,7 +0,0 @@
-snagit2019)
-    name="Snagit 2019"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2019" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2019" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
--- a/fragments/labels/snagit2020.sh
+++ b/fragments/labels/snagit2020.sh
@@ -1,7 +0,0 @@
-snagit2020)
-    name="Snagit 2020"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2020" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2020" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
--- a/fragments/labels/snagit2021.sh
+++ b/fragments/labels/snagit2021.sh
@@ -1,7 +0,0 @@
-snagit2021)
-    name="Snagit 2021"
-    type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2021" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
-    expectedTeamID="7TQL462TU8"
-    ;;
--- a/fragments/labels/sonobus.sh
+++ b/fragments/labels/sonobus.sh
@@ -1,9 +0,0 @@
-sonobus)
-    name="Sonobus"
-    type="pkgInDmg"
-    html_page_source="$(curl -fs 'https://www.sonobus.net')"
-    downloadFile="$(echo "${html_page_source}" | xmllint --html --xpath "string(//a[contains(@href, 'mac.dmg')]/@href)" - 2> /dev/null)"
-    downloadURL="https://www.sonobus.net/$downloadFile"
-    appNewVersion="$(echo "${downloadFile}" | sed 's/releases\/sonobus-//' | sed 's/\-mac.dmg//' )"
-    expectedTeamID="XCS435894D"
-    ;;
--- a/fragments/labels/talkdeskcallbar.sh
+++ b/fragments/labels/talkdeskcallbar.sh
@@ -1,7 +1,7 @@
 talkdeskcallbar)
    name="Callbar"
    type="dmg"
-    appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p')
-    downloadURL=https://downloadcallbar.talkdesk.com/Callbar-${appNewVersion}.dmg
+    downloadURL=https://downloadcallbar.talkdesk.com/Callbar-$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p').dmg
+    appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version":"\([^"]*\)".*$/\1/p')
    expectedTeamID="YGGJX44TB8"
    ;;
--- a/fragments/labels/talkdeskcxcloud.sh
+++ b/fragments/labels/talkdeskcxcloud.sh
@@ -1,7 +0,0 @@
-talkdeskcxcloud)
-    name="Talkdesk"
-    type="dmg"
-    appNewVersion=$(curl -fs https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json | sed -n -e 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p' | head -n 1)
-    downloadURL="https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-${appNewVersion}.dmg"
-    expectedTeamID="YGGJX44TB8"
-    ;;
--- a/fragments/labels/thunderbird_intl.sh
+++ b/fragments/labels/thunderbird_intl.sh
@@ -1,25 +0,0 @@
-thunderbird_intl)
-    # This label will try to figure out the selected language of the user,
-    # and install corrosponding version of Thunderbird
-    name="Thunderbird"
-    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
-    printlog "Found language $userLanguage to be used for $name."
-    releaseURL="https://ftp.mozilla.org/pub/thunderbird/releases/latest/README.txt"
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
-        if [ ${#userLanguage} -eq 2 ]; then
-            break
-        fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx"
-    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}')
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( thunderbird )
-    ;;
--- a/fragments/labels/ultimakercura.sh
+++ b/fragments/labels/ultimakercura.sh
@@ -1,8 +0,0 @@
-ultimakercura)
-    name="Ultimaker Cura"
-    type="dmg"
-    downloadURL="$(downloadURLFromGit Ultimaker Cura)"
-    archiveName="Ultimaker_Cura-[0-9].*-Darwin.dmg"
-    appNewVersion=$(versionFromGit Ultimaker Cura )
-    expectedTeamID="V4B3JXRRQS"
-    ;;
--- a/fragments/labels/unnaturalscrollwheels.sh
+++ b/fragments/labels/unnaturalscrollwheels.sh
@@ -1,8 +0,0 @@
-unnaturalscrollwheels)
-    name="UnnaturalScrollWheels"
-    type="dmg"
-    downloadURL="$(downloadURLFromGit ther0n UnnaturalScrollWheels)"
-    appNewVersion="$(versionFromGit ther0n UnnaturalScrollWheels)"
-    expectedTeamID="D6H5W2T379"
-    blockingProcesses=( UnnaturalScrollWheels )
-    ;;
--- a/fragments/labels/wechat.sh
+++ b/fragments/labels/wechat.sh
@@ -1,6 +0,0 @@
-wechat)
-    name="WeChat"
-    type="dmg"
-    downloadURL="https://dldir1.qq.com/weixin/mac/WeChatMac.dmg"
-    expectedTeamID="5A4RE8SF68"
-    ;;
--- a/fragments/labels/xeroxworkcentre7800.sh
+++ b/fragments/labels/xeroxworkcentre7800.sh
@@ -1,9 +0,0 @@
-xeroxworkcentre7800)
-    name="XeroxWorkCentre"
-    type="pkgInDmg"
-    appCustomVersion(){ lpinfo -m | grep 783 | tail -n 1 | awk -F ', ' '{print $2}' }
-    appNewVersion=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | grep .dmg | head -n 1 | awk -F '_' '{print $2}' )
-    downloadURL=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg" )
-    expectedTeamID="G59Y3XFNFR"
-    blockingProcesses=( NONE )
-;;
--- a/fragments/labels/zohoworkdrivegenie.sh
+++ b/fragments/labels/zohoworkdrivegenie.sh
@@ -1,8 +0,0 @@
-zohoworkdrivegenie)
-    name="Zoho WorkDrive Genie"
-    type="dmg"
-    # https://www.zoho.com/workdrive/genie.html
-    downloadURL="https://www.zoho.com/workdrive/downloads/edit-tool/Zoho_WorkDrive_Genie.dmg"
-    CLIInstaller="Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie"
-    expectedTeamID="TZ824L8Y37"
-    ;;
--- a/fragments/version.sh
+++ b/fragments/version.sh
@@ -1 +1 @@
-10.0beta
+10dev
--- a/utils/README.md
+++ b/utils/README.md
@@ -1,6 +1,6 @@
 # How to assemble Installomator.sh

-Since the Installomator.sh script has grown to over 5000 lines, its management on git has become very unwieldy. The single file with all the logic and the data required to download and install the applications creates constant merge conflicts which add to the workload of the repo admins, especially when part of the team is working on the logic of the script while we still get PRs to add labels.
+Since the Installomator.sh script has grown to over 3000 lines, its management on git has become very unwieldy. The single file with all the logic and the data required to download and install the applications creates constant merge conflicts which add to the workload of the repo admins, especially when part of the team is working on the logic of the script while we still get PRs to add labels.

 Because of that we have split the main script into multiple files which are easier to manage. Having multiple files results in less merge conflicts.

@@ -53,30 +53,26 @@ Once you are certain that your new custom label works, you can use the code from

 The `Installomator.sh` script at the root of the repo does not really get involved in your building and testing. Similarly, if you want to apply, test, and contribute changes to the script's logic, you should modify the fragment file in question and test using the assemble script.

-Pull requests against the `Installomator.sh` script in the root of the repo will be rejected.
+Pull requests against the `Installomator.sh` script in the root of the repo will be rejected. (Excepting the backlog of existing PRs.)

 ## How do I contribute new or modified labels back to the Installomator project?

 ### When you are familiar with git and GitHub

- If you haven't already, create a fork of the Installomator repo. Clone the for to your local Mac.
- Create a new branch in your local Installomator (fork) repo.
+- Create a new branch in your local Installomator fork repo.
 - Copy the new or modified label file to `fragments/labels`. (replacing the original, when necessary)
- Test (push the change to your fork on GitHub. You can check that out on testing devices or vms.)
- Create a pull request against the Installomator `main` branch.
- Don't use this branch for _any_ other modifications, unless you need to update this particular PR. (Pull Requests are against a _branch_, not a particular commit.)
+- Create a pull request against the main Installomator dev branch.
+- Don't use this branch for any other modifications, unless you need to update this particular PR. (Pull Requests are against a _branch_, not a particular commit.)

-If you have multiple labels (or other changes) you want to contribute, please create a _separate_ local branch and a _separate_ pull request for each label. This allows us to accept, modify, or reject each label separately and simplifies the process. 
-
-Once your Pull Request is merged into the main repo, you can pull the change to your local repo, push it to your fork, and delete the branch, because it should be fully merged.
-
-When you have multiple labels or changes, please create a separate issue for each label or change, unless they are closely related
+If you have multiple labels you want to contribute, please create a separate local branch and a separate pull request for each label.

+Once your Pull Request is merged into the main repo, you can pull the change to your fork and delete the branch.

 ### When you are not familiar with git and GitHub

-We have a tutorial on [How to create Pull Requests in GitHub](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+Create an Issue in the Installomator repo and include the contents of your custom label file.

+If you have multiple labels, please create a separate issue for each label.

 ## Fragments

@@ -111,7 +107,7 @@ All the contents of the label files in `labels` (and any custom label locations

 Finally, the `main.sh` fragment contains most of the main logic.

-The assemble script does not check _any_ of the files for syntax or completeness. You are responsible that everything fits together properly. (Pay special attention to remember the closing semi-colons `;;` and a final line break in the label files.)
+The assemble script does not check _any_ of the files for syntax or completeness. You are responsible that everything fits together properly. (Pay special attention to remember the closing semi-colons `;;` in the label files.)

 ## assemble.sh Usage
@@ -1 +1 @@
 .0beta
 dev