Trapping the script

Using these signals: ``` SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM SIGTSTP ``` Fixed #272
updated contributing.md
2026-03-09 05:11:59 +00:00 · 2022-02-08 13:11:08 +01:00 · 2022-02-08 11:13:03 +01:00 · 2022-02-08 10:50:55 +01:00 · 2022-02-08 10:41:30 +01:00 · 2022-02-08 10:38:57 +01:00
85 changed files with 2438 additions and 757 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,35 @@
+## v10
+
+- Now we trap the script, so if it is cancelled, we will run cleanupAndExit anyway, and have mounted diskimages unmounted and temporary files and folders removed.
+-
+
+## v9
+
+- We have moved the root check to the beginning of the script, and improved DEBUG handling with two different modes. `DEBUG=0` is still for production, and `1` is still for the DEBUG we previously knew downloading to the directory it is running from, but `2` will download to temporary folder, will detect updates, but will not install anything, but it will notify the user (almost as running the script without root before).
+- Added option to not interrupt Do Not Disturb full screen apps like Keynote or Zoom with `INTERRUPT_DND="no"`. Default is `"yes"` which is how it has worked until now.
+- `pkgName` in a label can now be searched for. An example is logitechoptions, where only the name of the pkg is given, and not the exact file path to it.
+- `LSMinimumSystemVersion` will now be honered, if the `Info.plist` in the app is specifying this. That means that an app that has this parameter in that file and it shows that the app requires a newer version of the OS than is currently installed, then we will not install it.
+- New variable `RETURN_LABEL_NAME`. If given the value `1`, like `RETURN_LABEL_NAME=1` then Installomator only returns the name of the label. It makes for a better user friendly message for displaying in DEPNotify if that is integrated.
+- Changed logic if `IGNORE_APP_STORE_APPS=yes`. Before this version a label like `microsoftonedrive` that was installed from App Store, and that we want to replace with the “ordinary” version, Installomator would still use `updateTool`, even though `IGNORE_APP_STORE_APPS=yes`. So we would have to have `INSTALL=force` in order to have the app replaced, as `updateTool` would be used. But now if `IGNORE_APP_STORE_APPS=yes` then `updateTool` will be not set, and the App Store app will be replaced. BUT if the installed software was not from App Store, then `updateTool` will not be used, and it would be a kind of a forced install (in the example of `microsoftonedrive`), except if the version is the same (where installation is skipped).
+- Added variable `SYSTEMOWNER` that is used when copying files when installing. Default `0` is to change owner of the app to the current user on the Mac, like this user was installing this app themselves. When using `1` we will put “root:wheel” on the app, which can be useful for shared machines.
+- Added option `curlOptions` to the labels. It can be filled with extra headers need for downloading the specific software. It needs to be an array, like `curlOptions=( )`. See “mocha”-software-labels.
+
+Big changes to logging:
+- Introducing variable `LOGGING`, that can be either of the logging levels
+- Logging levels:
+    0: DEBUG     Everything is logged
+    1: INFO      Normal logging behavior
+    2: WARN
+    3: ERROR
+    4: REQ
+- External logging to Datadog
+- A function to shorten duplicate lines in installation logs or output of longer commands
+- Ability to extract install.log in the time when Installomator was running, if further investigations needs to be done to logs
+
+Fixes:
+- Fixed a problem with pkgs: If they were mounted with .pkg in the name, then we would find the directory and not the pkg file itself.
+- Minor fix for a check for a pkgName on a DMG. We used `ls` that would throw an error when not found, so the check was corrected.
+
 ## v8.0

 - removed leading `0` from the version because it has lost all meaning (thanks to @grahampugh for the inspiration)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,22 +1,45 @@
 # 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 fragmented files, not the full `Installomator.sh` script. The full script is now a build of the fragments, and will be overwritten.__
+__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 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 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`.
+
+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, please take a look at the tutorials in the Wiki, if 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 really encourage you to try out finding the version of the app online, so that `appNewVersion` can be filled in the label. It helps a lot when the software needs update, and greatly improve user experience.
+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.

-Please include the log of installing this label in the description.
+Please include the log of installing this label in the description, like this:
+```
+% /Users/st/Documents/GitHub/Installomator/utils/assemble.sh software
+2021-11-24 10:07:19 software ################## Start Installomator v. 0.8.0
+2021-11-24 10:07:19 software ################## software
+2021-11-24 10:07:19 software DEBUG mode 1 enabled.
+```

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

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


 ## Issues
--- a/Installomator.sh
+++ b/Installomator.sh
--- a/Labels.txt
+++ b/Labels.txt
@@ -22,6 +22,7 @@ anydesk
 apparency
 appcleaner
 applenyfonts
+applesfarabic
 applesfcompact
 applesfmono
 applesfpro
@@ -72,6 +73,7 @@ cormorant
 craftmanager
 cryptomator
 cyberduck
+daisydisk
 dangerzone
 darktable
 dbeaverce
@@ -84,6 +86,7 @@ devonthink
 dialog
 dialpad
 discord
+diskspace
 docker
 drift
 dropbox
@@ -110,6 +113,7 @@ firefoxesr_intl
 firefoxesrpkg
 firefoxpkg
 flowjo
+flux
 front
 fsmonitor
 gimp
@@ -136,7 +140,9 @@ hazel
 hpeasyadmin
 hpeasystart
 hyper
+ibarcoder
 icons
+iina
 imazingprofileeditor
 inkscape
 insomnia
@@ -145,6 +151,7 @@ installomator_theile
 intellijideace
 istatmenus
 iterm2
+itsycal
 jabradirect
 jamfconnect
 jamfconnectconfiguration
@@ -177,6 +184,7 @@ libreoffice
 logitechoptions
 logseq
 loom
+lowprofile
 lucifer
 lulu
 maccyapp
@@ -211,6 +219,12 @@ microsoftvisualstudiocode
 microsoftword
 microsoftyammer
 miro
+mobikinassistantforandroid
+mochakeyboard
+mochatelnet
+mochatn3270
+mochatn3812
+mochatn5250
 montereyblocker
 mowgliiitsycal
 musescore
@@ -242,6 +256,7 @@ ottomatic
 overflow
 pacifist
 pandoc
+paretosecurity
 parsec
 pdfsam
 perimeter81
@@ -251,16 +266,22 @@ platypus
 plisteditpro
 postman
 prism9
+pritunl
 privileges
 proctortrack
+promiseutility
 promiseutilityr
+protonvpn
 proxyman
 pycharmce
 pymol
 r
 ramboxce
+rancherdesktop
 rectangle
 redeye
+remotedesktopmanagerenterprise
+remotedesktopmanagerfree
 remotix
 remotixagent
 resiliosynchome
@@ -280,6 +301,8 @@ scaleft
 screamingfrogseospider
 screencloudplayer
 screenflick
+sdnotary
+secretive
 sequelpro
 sfsymbols
 shield
@@ -314,6 +337,7 @@ suspiciouspackage
 swiftruntimeforcommandlinetools
 sync
 tableaudesktop
+tableaupublic
 tableaureader
 tageditor
 talkdeskcallbar
@@ -328,6 +352,7 @@ textmate
 theunarchiver
 things
 thunderbird
+tidal
 toggltrack
 tom4aconverter
 torbrowser
@@ -342,6 +367,7 @@ utm
 vagrant
 vanilla
 veracrypt
+vimac
 virtualbox
 viscosity
 visualstudiocode
@@ -375,4 +401,5 @@ zoomrooms
 zulujdk11
 zulujdk13
 zulujdk15
+zulujdk17
 zulujdk8
--- a/script.sh
+++ b/script.sh
@@ -12,6 +12,7 @@ what="brave" # enter the software to install
 caffeinatepid=$!
 caffexit () {
    kill "$caffeinatepid"
+    pkill caffeinate
    exit $1
 }

--- a/MDM/App-loop
+++ b/MDM/App-loop
@@ -12,6 +12,7 @@ what="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal"
 caffeinatepid=$!
 caffexit () {
    kill "$caffeinatepid"
+    pkill caffeinate
    exit $1
 }

--- a/MDM/Installomator
+++ b/MDM/Installomator
@@ -10,6 +10,7 @@ what="installomator" # enter the software to install
 caffeinatepid=$!
 caffexit () {
    kill "$caffeinatepid"
+    pkill caffeinate
    exit $1
 }

--- a/CustomSoftware.sh
+++ b/CustomSoftware.sh
@@ -20,6 +20,7 @@ what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the softwar
 caffeinatepid=$!
 caffexit () {
    kill "$caffeinatepid"
+    pkill caffeinate
    exit $1
 }

@@ -55,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="0.7.0"
+TARGET_VERSION="8.0"

 vercomp () {
    if [[ $1 == $2 ]]; then
--- a/MDM/MDMMosyle
+++ b/MDM/MDMMosyle
@@ -1,5 +1,5 @@
 PKG_ID="com.scriptingosx.Installomator"
-TARGET_VERSION="0.7.0"
+TARGET_VERSION="8.0"
 URLDOWNLOAD="%MosyleCDNFile:blah-blah-blah%"
 ######################################################################
 # Installation using Installomator (enter the software to install separated with spaces in the "what"-variable)
@@ -14,6 +14,7 @@ what="handbrake theunarchiver microsoftoffice365"
 caffeinatepid=$!
 caffexit () {
    kill "$caffeinatepid"
+    pkill caffeinate
    exit $1
 }

--- a/valuesfromarguments.sh
+++ b/valuesfromarguments.sh
@@ -9,6 +9,7 @@ what="valuesfromarguments" # enter the software to install
 caffeinatepid=$!
 caffexit () {
    kill "$caffeinatepid"
+    pkill caffeinate
    exit $1
 }

--- a/README.md
+++ b/README.md
@@ -8,11 +8,23 @@ This script is in the “we find it useful, it is working for us” stage.

 Your production and deployment environment will be different, please test thoroughly before rolling it out to your production.

-I have put a lot of work into making it stable and safe, but I cannot - of course - make _any_ promises that it won't break in some not yet encountered edge case.
+We have put a lot of work into making it stable and safe, but we cannot - of course - make _any_ promises that it won't break in some not yet encountered edge case.
+
+## Authors
+
+Intallomator was original inspired by the download scripts from William Smith and Sander Schram, and created by:
+    Armin Briegel - @scriptingosx
+
+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.

 ## Support and Contributing

-__Please note, that if you are contributing to this project with new labels or other suggestions in PRs, please put your changes in the fragmented files, not the full `Installomator.sh` script. The full script is now a build of the fragments, and will be overwritten. See the REAMDME.md file in the `utils` directory for detailed instructions.__
+__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. See the [README.md](utils/README.md) file in the `utils` directory for detailed instructions.__

 Discussion, support and advice around Installomator happens in the `#installomator` channel in the [MacAdmins.org Slack](https://macadmins.org). Go there for support questions.

@@ -22,31 +34,43 @@ Please see [CONTRIBUTING.md](https://github.com/Installomator/Installomator/blob

 ## More reading

-There are a few interesting post on Installomator on my weblog:
+Our wiki:
+
+- [Wiki](https://github.com/Installomator/Installomator/wiki)
+
+There are a few interesting post on Installomator on Armin’s weblog:

 - [Introducing Installomator](https://scriptingosx.com/2020/05/introducing-installomator/)
 - [Using Installomator with Jamf Pro](https://scriptingosx.com/2020/06/using-installomator-with-jamf-pro/) by Mischa van der Bent
- [Using another MDM than Jamf and you might want a local installation](https://github.com/Theile/Installomator/) By Søren Theilgaard

 ## Background

-As a system engineer at [an Apple Authorized Enterprise Reseller](https://prowarehouse.nl), we manage a lot of Jamf instances.
+In the world of managing Apple Macs, organizations can have two different approaches to the management. Either the IT department will tightly manage and verify each piece of software, or they will just want the latest software to be deployed as fast as possible.

-Some of these instances are tightly managed, i.e. the versions of the operating system and third party software are controlled and updates will only be pushed with the management system when the administration and security team went through an approval process and then the update is automated. This is an important and valid workflow and the right fit for many deployments.
+OK, maybe some software should be tightly managed and others not, but you get the point.
+
+### Tightly managed
+
+If your solution needs to be tightly managed, i.e. the versions of the operating system and third party software are controlled and updates will only be pushed with the management system when the administration and security team went through an approval process and then the update is automated. This is an important and valid workflow and the right fit for many deployments.

 Installomator was _not_ written for these kinds of deployment.

 If you are running this kind of deployment, you want to use [AutoPkg](https://github.com/autopkg/autopkg) and you can stop reading here.

-There are other kinds of deployments, though. In these deployments the management system is merely used to "get the user ready" as quickly as possible when they set up a new machine, and to offer software from a self service portal. In these deployments, system and software installations are 'latest version available' and updates are user driven (though we do want to nag them).
+### Latest version always

-These deployments are
+There are other kinds of deployments, though. In these deployments the management system is merely used to “get the user ready” as quickly as possible when they set up a new machine, and to offer software from a self service portal. In these deployments, system and software installations are ‘latest version available’ and updates are user driven (though we do want to nag them and push them).
+
+Installomator can help with this.
+
+These deployments can be

 - user driven
 - low control
 - minimal maintenance effort
+- latest version is best

-These are mostly 'user controlled' Macs and we (the admins) just want to assist the user in doing the right thing. And the right thing is (often) to install the latest versions and updates when they are available.
+These can be 'user controlled' Macs and we (the admins) just want to assist the user in doing the right thing. And the right thing is (often) to install the latest versions and updates when they are available.

 The Mac App Store and software pushed through the Mac App Store follow this approach. When you manage and deploy software through the App Store — whether it is on iOS or macOS — neither the MacAdmin nor the user get a choice of the application version. They will get the latest version.

@@ -63,16 +87,25 @@ Some of these disadvantages can be seen as advantages in different setups. When

 Because this is an attractive solution for _certain kinds_ of deployment, there are already many scripts out there that will download and install the latest version of a given software. And we have built and used quite a few in-house, as well. Most importantly, [William Smith has this script](https://gist.github.com/talkingmoose/a16ca849416ce5ce89316bacd75fc91a) which can be used to install several different Microsoft applications and bundles, because Microsoft has a nice unified URL scheme.

-At some point, earlier this year, I got frustrated at the number of scripts we were maintaining (or failing to). Also, my concern that most of the scripts weren't doing _any_ verification of the download was getting unbearable. So, I set out to write the one install script to rule them all...
+At some point, in 2018, Armin got frustrated at the number of scripts he was maintaining (or failing to). Also, his concern that most of the scripts weren’t doing _any_ verification of the download was getting unbearable. So, he set out to write _the one install script to rule them all…_
+
+### Locally installed
+
+So Armin made the version for Jamf Pro but universally for any MDM to adopt.
+
+Søren looked at this, and wanted this approach to work in Mosyle and Addigy, and for these solutions we need Installomator to be locally installed on. the Mac, and then the MDM can call this script from their scripts features. For some time Søren had a version of Installomator that was supplied with a notarized pkg, so it could be deployed as part of DEP or however was needed.
+
+This has now been merged into Installomator, and with contributions of Isaac and Adam, new features and labels have been added more frequently.

 ## Goals

-My goals for Installomator are:
+The goals for Installomator are:

 - work with various common archive types
 - verify the downloaded archive or application
- have a simple 'interface' to the admin
- single script file so it can 'easily' be copied into a management system
+- have a simple ‘interface’ to the admin
+- single script file so it can ‘easily’ be copied into a management system
+- signed and notarized pkg-installer for local installation
 - extensible without deep scripting knowledge
 - work independently of a specific management system
 - no dependencies that may be removed from macOS in the future or are not pre-installed
@@ -89,9 +122,9 @@ Installomator can work with the following common archive and installer types:

 When the download yields a pkg file, Installomator will run `installer` to install it on the current system.

-Applications in dmgs or zips will be copied to `/Applications` and their owner will be set to the current user, so the install works like a standard drag'n drop installation.
+Applications in dmgs or zips will be copied to `/Applications` and their owner will be set to the current user, so the install works like a standard drag'n drop installation. Owner can also be set to root/wheel.

-(I consider it a disgrace, that Jamf, after nearly 20 years, _still_ cannot deal with 'drag'n drop installation dmgs' natively. It's not _that_ hard.)
+(I consider it a disgrace, that Jamf, after nearly 20 years, _still_ cannot deal with ‘drag’n drop installation dmgs natively. It’s not _that_ hard.)

 ### Verify the download

@@ -108,11 +141,11 @@ When used to install software, Installomator has a single argument: the label or
 ./Installomator.sh firefox LOGO=jamf BLOCKING_PROCESS_ACTION=tell_user_then_kill NOTIFY=all
 ```

-There is a debug mode and one other setting that can be controlled with variables in the code. This simplifies the actual use of the script from within a management system.
+There is a debug mode and other settings that can be controlled with variables in the code. This simplifies the actual use of the script from within a management system.

 ### Extensible

-As of this writing, Installomator knows how to download and install more than 238 different applications. You can add more by adding a block to the _long_ `case` statement starting on line 758. Some of them are more elaborate, but most of them (just) need this information (not really "just" in this case, as we have to differentiate between arm64 and i386 versions for both `downloadURL` and `appNewVersion`):
+As of this writing, Installomator knows how to download and install more than 364 different applications. You can add more by adding new labels to the `fragments`-folder. Below is an example of a label, and most of them (just) needs this information (not really "just" in this case, as we have to differentiate between arm64 and i386 versions for both `downloadURL` and `appNewVersion`):

 ```
 googlechrome)
@@ -121,11 +154,11 @@ googlechrome)
    if [[ $(arch) != "i386" ]]; then
        printlog "Architecture: arm64 (not i386)"
        downloadURL="https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg"
-        appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}') # Credit: William Smith (@meck)
+        appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
    else
        printlog "Architecture: i386"
        downloadURL="https://dl.google.com/chrome/mac/stable/GGRO/googlechrome.dmg"
-        appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac,stable/{print $3; exit}') # Credit: William Smith (@meck)
+        appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac,stable/{print $3; exit}')
    fi
    expectedTeamID="EQHXZ8M8AV"
    ;;
@@ -133,19 +166,21 @@ googlechrome)

 When you know how to extract these pieces of information from the application and/or download, then you can add an application to Installomator.

-The script `buildCaseStatement.sh` can help with the label creation.
+The script `buildLabel.sh` can help with the label creation. Just server the URL to the script, and it will try to figure out things and write out a label as output. See [Wiki Tutorials](https://github.com/Installomator/Installomator/wiki#tutorials).

 Please note: Labels should be named in small caps, numbers 0-9, “-”, and “_”. No other characters allowed.

+Actually labels are part of a case-statement, and must be formatted accordingly.
+
 ### Not specific to a management system

-I wrote this script mainly for use with Jamf Pro, because that is what we use. For testing, you can run the script interactively from the command line. However, I have tried to keep anything that is specific to Jamf optional, or so flexible that it will work anywhere. Even if it does not work with your management system 'out of the box,' the adaptations should be straightforward.
+Armin wrote this script mainly for use with Jamf Pro, because that is what he used. For testing, you can run the script interactively from the command line. However, we have tried to keep anything that is specific to Jamf optional, or so flexible that it will work anywhere. Even if it does not work with your management system ‘out of the box’, the adaptations should be straightforward.

-Not all MDMs can include the full script, for those MDMs it might be more useful to install it on the client machines, and run it from there. See [Using another MDM than Jamf and you might want a local installation](https://github.com/Theile/Installomator/) By Søren Theilgaard.
+Not all MDMs can include the full script, for those MDMs it might be more useful to install it on the client machines, and run it from there. So a PKG to be installed on client Macs is also provided here.

 ### No dependencies

-The script started out as a pure `sh` script, and when I needed arrays I 'switched' to `zsh`, because that is what [we can rely on being in macOS for the foreseeable future](https://scriptingosx.com/zsh). There are quite a few places where using python would have been easier and safer, but with the python 2 run-time being deprecated, that would have added a requirement for a Python 3 run-time to be installed. XML and JSON parsing would have been better with a tool like [scout](https://github.com/ABridoux/scout) or [jq](https://stedolan.github.io/jq/), but those would again require additional installations on the client before the script can run.
+The script started out as a pure `sh` script, and when arrays was needed it was ‘switched’ to `zsh`, because that is what [we can rely on being in macOS for the foreseeable future](https://scriptingosx.com/zsh). There are quite a few places where using python would have been easier and safer, but with the python 2 run-time being deprecated, that would have added a requirement for a Python 3 run-time to be installed. XML and JSON parsing would have been better with a tool like [scout](https://github.com/ABridoux/scout) or [jq](https://stedolan.github.io/jq/), but those would again require additional installations on the client before the script can run.

 Keeping the script as a `zsh` allows you to paste it into your management system's interface (and disable the DEBUG mode) and use it without requiring any other installations.

@@ -178,19 +213,19 @@ Other than the version arguments, the argument can be any of the labels listed i

 ### Debug mode

-There is a variable named `DEBUG` which is set in line 21 of the script. When `DEBUG` is set to `1` (default) no actions that would actually modify the current system are taken. This is useful for testing most of the actions in the script, but obviously not all of them.
+There is a variable named `DEBUG` which is set in line 21 of the script. When `DEBUG` is set to `1` (default) or `2` for a variation of debug, no actions that would actually modify the current system are taken. This is useful for testing most of the actions in the script, but obviously not all of them.

-Also when the `DEBUG` variable is `1`, downloaded archives and extracted files will be written to the script's directory, rather than a temporary directory, which can make debugging easier.
+When the `DEBUG` variable is `1`, downloaded archives and extracted files will be written to the script's directory, rather than a temporary directory, which can make debugging easier.

-_Always remember_ to change the `DEBUG` variable to `0` when deploying.
+When `DEBUG` variable is `2`, the temporary folder is created and downloaded and extracted files goes to that folder, as if not in DEBUG mode, but installation is still not done. On the other hand blocking processes are checked, the app is reopened if closed, and the user is notified.

-### Use Installomator with Jamf Pro
+Debug mode 1 is useful to test the download and verification process without having to re-download and re-install an application or package on your system. Debug mode 2 is great for checking running processe and notifications.

-In Jamf Pro, create a new 'Script' and paste the contents of `Installomator.sh` into the 'Script Contents' area. Under 'Options' you can change the parameter label for argument 4 to 'Application Label.'
+_Always remember_ to change the `DEBUG` variable to `0` when deploying. The installer PKG we provide has `DEBUG=0`.

-Remember to set `DEBUG` to `0`.
+### Use Installomator with various MDM solutions

-Then you can use the Installomator script in a policy and choose the application to install by setting the label for argument 4.
+In the wiki we have provided documentation on how Installomator is used in various MDM solution, like [Jamf Pro](https://github.com/Installomator/Installomator/wiki/MDM:-Jamf-Pro), [Mosyle](https://github.com/Installomator/Installomator/wiki/MDM:-Mosyle-(Business,-Fuse,-and-Manager)), and [Addigy](https://github.com/Installomator/Installomator/wiki/MDM:-Addigy).

 ## What it does

@@ -198,7 +233,7 @@ When it runs with a known label, the script will perform the following:

 - Check the version installed with the version online. Only continue if it's different
 - download the latest version from the vendor
- when the application is running, prompt the user to quit or cancel
+- when the application is running, prompt the user to quit or cancel (customizable)
 - dmg or zip archives:
    - extract the application and copy it to /Applications
    - change the owner of the application to the current user
@@ -206,19 +241,11 @@ When it runs with a known label, the script will perform the following:
    - when necessary, extract the pkg from the enclosing archive
    - install the pkg with the `installer` tool
 - clean up the downloaded files
- notify the user
+- notify the user (also customizable)

 ## Configuring the script

-As of now there are two settings that are meant to configured when deploying the script.
-
-### Debug mode
-
-The first is the `DEBUG` variable. When this is set to `1` the script will _not_ perform any changes to the current system. In other words, no application will be copied to the target directory and no `installer` command be performed.
-
-In addition, files will be downloaded and extracted to the Installomator project folder instead of a temporary directory and _not_ deleted when the script exits. Also archives will _not_ be re-downloaded when they already exist in the project folder. The repository's `.gitignore` file is set up to ignore the archive file extensions.
-
-Debug mode is useful to test the download and verification process without having to re-download and re-install an application or package on your system.
+We have several default settings for certain behavior and notifications inside the script, but these can be customized when calling the script.

 ### Blocking Process actions

@@ -227,13 +254,13 @@ The `BLOCKING_PROCESS_ACTION` variable controls the behavior of the script when
 There are eight options:

 - `ignore`: continue even when blocking processes are found.
- `silent_fail`: exit script without prompt or installation.
- `prompt_user`: (default) show a user dialog for each blocking process found abort after three attempts to quit (only if user accepts to quit the apps, otherwise the update is cancelled).
- `prompt_user_then_kill`: show a user dialog for each blocking process found, attempt to quit two times, kill the process finally.
+- `silent_fail`: Exit script without prompt or installation.
+- `prompt_user`: Show a user dialog for each blocking process found, user can choose "Quit and Update" or "Not Now". When "Quit and Update" is chosen, blocking process will be told to quit. Installomator will wait 30 seconds before checking again in case Save dialogs etc are being responded to. Installomator will abort if quitting after three tries does not succeed. "Not Now" will exit Installomator.
+- `prompt_user_then_kill`: show a user dialog for each blocking process found, user can choose "Quit and Update" or "Not Now". When "Quit and Update" is chosen, blocking process will be terminated. Installomator will abort if terminating after two tries does not succeed. "Not Now" will exit Installomator.
 - `prompt_user_loop`: Like prompt-user, but clicking "Not Now", will just wait an hour, and then it will ask again.
-WARNING! It might block the MDM agent on the machine, as the scripts gets stuct in waiting until the hour has passed, possibly blocking for other management actions in this time.
- `tell_user`: User will be showed a notification about the important update, but user is only allowed to quit and continue, and then we ask the app to quit.
- `tell_user_then_kill`: Show dialog 2 times, and if the quitting fails, the blocking processes will be killed.
+  WARNING! It might block the MDM agent on the machine, as the script will not exit, it will pause until the hour has passed, possibly blocking for other management actions in this time.
+- `tell_user`: (Default) User will be showed a notification about the important update, but user is only allowed to Quit and Continue, and then we ask the app to quit. This is default.
+- `tell_user_then_kill`: User will be showed a notification about the important update, but user is only allowed to Quit and Continue. If the quitting fails, the blocking processes will be terminated.
 - `kill`: kill process without prompting or giving the user a chance to save.

 If any process was closed, Installomator will try to open the app again, after the update process is done.
@@ -263,11 +290,17 @@ __options:__
 - `no`: If installed app is from App Store (which include VPP installed apps) it will not be touched, no matter it's version (default)
 - `yes`: Replace App Store (and VPP) version of app and handle future updates using Installomator, even if latest version. Shouldn’t give any problems for the user in most cases. Known bad example: Slack will loose all settings.

+### Owner of copied apps
+Default is `SYSTEMOWNER=0`
+__options:__
+- `0`: Current user will be owner of copied apps, just like if they installed it themselves (default).
+- `1`: root:wheel will be set on the copied app. Useful for shared machines.
+
 ### Install behavior (force installation)

 Since we now make a version checking, and only installs the software if the version is different, an `INSTALL` variable can be used to force the installation:

- ``:            When not set, software is only installed if it is newer/different in version (default)
+- ` `:           When not set, software is only installed if it is newer/different in version (default)
 - `force`:       Install even if it’s the same version

 ### Re-opening of closed app
@@ -277,9 +310,29 @@ The `REOPEN` can be used to prevent the reopening of a closed app
 - `yes`:   (default) app will be reopened if it was closed
 - `no`:    app not reopened

-### Adding applications/label blocks
+### Configuration from Arguments

-#### Required Variables
+You can provide a configuration variable, such as `DEBUG` or `NOTIFY` as an argument in the form `VAR=value`. For example:
+
+```
+./Installomator.sh desktoppr DEBUG=0 NOTIFY=silent
+```
+
+Providing variables this way will override any variables set in the script.
+
+You can even provide _all_ the variables necessary for download and installation. Of course, without a label the argument parsing will fail, so I created a special label `valuesfromarguments` which only checks if the four required values are present:
+
+```
+./Installomator.sh name=desktoppr type=pkg downloadURL=https://github.com/scriptingosx/desktoppr/releases/download/v0.3/desktoppr-0.3.pkg expectedTeamID=JME5BW3F3R valuesfromarguments
+```
+
+The order of the variables and label is not relevant. But, when you provide more than one label, all but the _last_ label will be ignored.
+
+Providing all the variables this way might be useful for certain downloads that have a customized URL for each vendor/customer (like customized TeamView or Watchman Monitoring) or are local downloads.
+
+## Adding applications/label blocks
+
+### Required Variables

 The script requires four pieces of information to download and install an application:

@@ -312,6 +365,12 @@ The URL from which to download the archive.
 The URL can be generated by a series of commands, for example when you need to parse an xml file for the latest URL. (See `bbedit`, `desktoppr`, or `omnigraffle` for examples.)
 Sometimes version differs between Intel and Apple Silicon versions. (See `brave`,  `obsidian`, `omnidisksweeper`, or `notion`).

+- `curlOptions`: (array, optional)
+Options to the `curl` command, needed for `curl` to be able to download the software.
+Usually used for adding extra headers that some servers need in order to serve the file.
+`curlOptions=( -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" )`
+(See “mocha”-labels, for examples on labels, and `buildLabel.sh` for header-examples.)
+
 - `appNewVersion` (optional, but recommended):
 Version of the downloaded software.
 If given, it will be compared to installed version, to see if download is different.
@@ -332,8 +391,7 @@ The 10-character Developer Team ID with which the application or pkg is signed a
   - Installation Packages (pkg)
     `spctl -a -vv -t install ~/Downloads/desktoppr-0.2.pkg`

-
-#### Optional Variables
+### Optional Variables

 Depending on the application or pkg there are a few more variables you can or need to set. Many of these are derived from the required variables, but may need to be set manually if those derived values do not work.

@@ -390,42 +448,17 @@ Depending on the application or pkg there are a few more variables you can or ne
  Introduced as part of `CLIInstaller`. If the installer in the DMG or ZIP is named differently than the installed app, then this variable can be used to name the installer that should be located after mounting/expanding the downloaded archive.
  See label adobecreativeclouddesktop

-### Configuration from Arguments
-
-You can provide a configuration variable, such as `DEBUG` or `NOTIFY` as an argument in the form `VAR=value`. For example:
-
-```
-./Installomator.sh desktoppr DEBUG=0 NOTIFY=silent
-```
-
-Providing variables this way will override any variables set in the script.
-
-You can even provide _all_ the variables necessary for download and installation. Of course, without a label the argument parsing will fail, so I created a special label `valuesfromarguments` which only checks if the four required values are present:
-
-```
-./Installomator.sh name=desktoppr type=pkg downloadURL=https://github.com/scriptingosx/desktoppr/releases/download/v0.3/desktoppr-0.3.pkg expectedTeamID=JME5BW3F3R valuesfromarguments
-```
-
-The order of the variables and label is not relevant. But, when you provide more than one label, all but the _last_ label will be ignored.
-
-Providing all the variables this way might be useful for certain downloads that have a customized URL for each vendor/customer (like customized TeamView or Watchman Monitoring) or are local downloads.
-
-
 ## Frequently Asked Questions

 ### What if the latest version of the app is already installed?

-Short answer: Installomator will re-download and re-install the latest over the existing installation.
+Short answer: That depends on if labels will know what the latest version will be.

 Longer answer:

-Installomator will try to find a currently installed app to log the version. When Installomator finds an existing app (any version) and the `updateTool` variable is set, then Installomator will _not_ download and install, but run the `updateTool` instead.
-
-However, there is no simple generic method to actually determine the latest version of an application or installer.
-
-We deploy Installomator usually for user initiated installations from Self Service, so re-installs don't really 'hurt' and may be a useful troubleshooting step.
-
-When you want to have automated installations, you can use smart groups based on the app version to limit excessive re-installations.
+- Labels without this will re-download and re-install the latest over the existing installation.
+- Labels with this info will only install the app if the version is different than the one installed.
+- Labels that can use update tool will use that for the update (if the version is different)

 ### Why don't you just use `autopkg install`?

@@ -455,7 +488,7 @@ Please don't misunderstand this as me saying that AutoPkg is a bad or poorly des

 But it is not suited as a client install automation tool.

-### Why don't you just use brew?
+### Why don't you just use brew or MacPorts?

 Read the explanation for `autopkg`, pretty much the same applies for `brew`, i.e. while it is useful on a single Mac, it is a un-manageable mess when you think about deploying and managing on a fleet of computers.

--- a/fragments/arguments.sh
+++ b/fragments/arguments.sh
@@ -1,7 +1,13 @@
-# MARK: check minimal macOS requirement
+# MARK: 3 Arguments
+
+# Start trapping the script
+trap_with_arg func_trap SIGHUP SIGINT SIGQUIT SIGABRT SIGTERM SIGTSTP
+
+# check minimal macOS requirement
 autoload is-at-least

-if ! is-at-least 10.14 $(sw_vers -productVersion); then
+installedOSversion=$(sw_vers -productVersion)
+if ! is-at-least 10.14 $installedOSversion; then
    printlog "Installomator requires at least macOS 10.14 Mojave."
    exit 98
 fi
@@ -42,21 +48,61 @@ if [[ $label == "version" ]]; then
    exit 0
 fi

-printlog "################## Start Installomator v. $VERSION"
-printlog "################## $label"
+# MARK: Logging
+log_location="/private/var/log/Installomator.log"
+
+# Check if we're in debug mode, if so then set logging to DEBUG, otherwise default to INFO
+# if no log level is specified.
+if [[ $DEBUG -ne 0 ]]; then
+    LOGGING=DEBUG
+elif [[ -z $LOGGING ]]; then
+    LOGGING=INFO
+    datadogLoggingLevel=INFO
+fi
+
+# Associate logging levels with a numerical value so that we are able to identify what
+# should be removed. For example if the LOGGING=ERROR only printlog statements with the
+# level REQ and ERROR will be displayed. LOGGING=DEBUG will show all printlog statements.
+# If a printlog statement has no level set it's automatically assigned INFO.
+
+declare -A levels=(DEBUG 0 INFO 1 WARN 2 ERROR 3 REQ 4)
+
+# If we are able to detect an MDM URL (Jamf Pro) or another identifier for a customer/instance we grab it here, this is useful if we're centrally logging multiple MDM instances.
+if [[ -f /Library/Preferences/com.jamfsoftware.jamf.plist ]]; then
+    mdmURL=$(defaults read /Library/Preferences/com.jamfsoftware.jamf.plist jss_url)
+elif [[ -n "$MDMProfileName" ]]; then
+    mdmURL=$(sudo profiles show | grep -A3 "$MDMProfileName" | sed -n -e 's/^.*organization: //p')
+else
+    mdmURL="Unknown"
+fi
+
+# Generate a session key for this run, this is useful to idenify streams when we're centrally logging.
+SESSION=$RANDOM
+
+# Mark: START
+printlog "################## Start Installomator v. $VERSION, date $VERSIONDATE" REQ
+printlog "################## Version: $VERSION" INFO
+printlog "################## Date: $VERSIONDATE" INFO
+printlog "################## $label" INFO

 # Check for DEBUG mode
 if [[ $DEBUG -gt 0 ]]; then
-    printlog "DEBUG mode $DEBUG enabled."
+    printlog "DEBUG mode $DEBUG enabled." DEBUG
 fi

 # How we get version number from app
-# (alternative is "CFBundleVersion", that can be used in labels)
-versionKey="CFBundleShortVersionString"
+if [[ -z $versionKey ]]; then
+    versionKey="CFBundleShortVersionString"
+fi

 # get current user
 currentUser=$(scutil <<< "show State:/Users/ConsoleUser" | awk '/Name :/ { print $3 }')

+# MARK: check for root
+if [[ "$(whoami)" != "root" && "$DEBUG" -eq 0 ]]; then
+    # not running as root
+    cleanupAndExit 6 "not running as root, exiting"
+fi

 # MARK: labels in case statement
 case $label in
@@ -84,4 +130,4 @@ valuesfromarguments)
    fi
    ;;

-# label descriptions start here
+# Mark: label descriptions start here
--- a/fragments/disabled/mightymike.sh
+++ b/fragments/disabled/mightymike.sh
@@ -1,5 +1,5 @@
 mightymike)
-    name="Nanosaur"
+    name="Mighty Mike"
    type="dmg"
    downloadURL=$(downloadURLFromGit jorio MightyMike)
    appNewVersion=$(versionFromGit jorio MightyMike)
--- a/fragments/disabled/nanosaur.sh
+++ b/fragments/disabled/nanosaur.sh
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -1,26 +1,45 @@
-# MARK: Functions
-
-cleanupAndExit() { # $1 = exit code, $2 message
-    if [[ -n $2 && $1 -ne 0 ]]; then
-        printlog "ERROR: $2"
-    fi
-    if [ "$DEBUG" -eq 0 ]; then
-        # remove the temporary working directory when done
-        printlog "Deleting $tmpDir"
-        rm -Rf "$tmpDir"
-    fi
+# MARK: 2 Functions

+cleanupAndExit() { # $1 = exit code, $2 message, $3 level
    if [ -n "$dmgmount" ]; then
        # unmount disk image
-        printlog "Unmounting $dmgmount"
-        hdiutil detach "$dmgmount"
+        printlog "Unmounting $dmgmount" DEBUG
+        unmountingOut=$(hdiutil detach "$dmgmount" 2>&1)
+        printlog "Debugging enabled, Unmounting output was:\n$unmountingOut" DEBUG
    fi
+    if [ "$DEBUG" -ne 1 ]; then
+        # remove the temporary working directory when done (only if DEBUG is not used)
+        printlog "Deleting $tmpDir" DEBUG
+        deleteTmpOut=$(rm -Rfv "$tmpDir")
+        printlog "Debugging enabled, Deleting tmpDir output was:\n$deleteTmpOut" DEBUG
+    fi
+
    # If we closed any processes, reopen the app again
    reopenClosedProcess
-    printlog "################## End Installomator, exit code $1 \n\n"
+    if [[ -n $2 && $1 -ne 0 ]]; then
+        printlog "ERROR: $2" $3
+    fi
+    printlog "################## End Installomator, exit code $1 \n\n" REQ
+    
+    # if label is wrong and we wanted name of the label, then return ##################
+    if [[ $RETURN_LABEL_NAME -eq 1 ]]; then
+        1=0 # If only label name should be returned we exit without any errors
+        echo "#"
+    fi
    exit "$1"
 }

+# Two functions to trap the script
+trap_with_arg() {
+    func="$1" ; shift
+    for sig ; do
+        trap "$func $sig" "$sig"
+    done
+}
+func_trap() {
+    cleanupAndExit 255 "Installomator has been terminated with: $1" ERROR
+}
+
 runAsUser() {
    if [[ $currentUser != "loginwindow" ]]; then
        uid=$(id -u "$currentUser")
@@ -59,26 +78,84 @@ displaynotification() { # $1: message $2: title
    fi
 }

-
-# MARK: Logging
-log_location="/private/var/log/Installomator.log"
-
 printlog(){
-
+    [ -z "$2" ] && 2=INFO
+    log_message=$1
+    log_priority=$2
    timestamp=$(date +%F\ %T)
-        
-    if [[ "$(whoami)" == "root" ]]; then
-        echo "$timestamp" "$label" "$1" | tee -a $log_location
-    else
-        echo "$timestamp" "$label" "$1"
+
+    # Check to make sure that the log isn't the same as the last, if it is then don't log and increment a timer.
+    if [[ ${log_message} == ${previous_log_message} ]]; then
+        let logrepeat=$logrepeat+1
+        return
    fi
+    previous_log_message=$log_message
+
+    # Once we finally stop getting duplicate logs output the number of times we got a duplicate.
+    if [[ $logrepeat -gt 1 ]];then
+        echo "$timestamp" : "${log_priority} : $label : Last Log repeated ${logrepeat} times" | tee -a $log_location
+
+        if [[ ! -z $datadogAPI ]]; then
+            curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : $APPLICATION : $VERSION : $SESSION : Last Log repeated ${logrepeat} times" > /dev/null
+        fi
+        logrepeat=0
+    fi
+
+    # If the datadogAPI key value is set and our logging level is greater than or equal to our set level
+    # then post to Datadog's HTTPs endpoint.
+    if [[ -n $datadogAPI && ${levels[$log_priority]} -ge ${levels[$datadogLoggingLevel]} ]]; then
+        while IFS= read -r logmessage; do
+            curl -s -X POST https://http-intake.logs.datadoghq.com/v1/input -H "Content-Type: text/plain" -H "DD-API-KEY: $datadogAPI" -d "${log_priority} : $mdmURL : Installomator-${label} : ${VERSIONDATE//-/} : $SESSION : ${logmessage}" > /dev/null
+        done <<< "$log_message"
+    fi
+    
+    # Extra spaces
+    space_char=""
+    if [[ ${#log_priority} -eq 3 ]]; then
+        space_char="  "
+    elif [[ ${#log_priority} -eq 4 ]]; then
+        space_char=" "
+    fi
+    # If our logging level is greaterthan or equal to our set level then output locally.
+    if [[ ${levels[$log_priority]} -ge ${levels[$LOGGING]} ]]; then
+        while IFS= read -r logmessage; do
+            if [[ "$(whoami)" == "root" ]]; then
+                echo "$timestamp" : "${log_priority}${space_char} : $label : ${logmessage}" | tee -a $log_location
+            else
+                echo "$timestamp" : "${log_priority}${space_char} : $label : ${logmessage}"
+            fi
+        done <<< "$log_message"
+    fi
+}
+
+# Used to remove dupplicate lines in large log output,
+# for example from msupdate command after it finishes running.
+deduplicatelogs() {
+    loginput=${1:-"Log"}
+    logoutput=""
+    # Read each line of the incoming log individually, match it with the previous.
+    # If it matches increment logrepeate then skip to the next line.
+    while read log; do
+        if [[ $log == $previous_log ]];then
+            let logrepeat=$logrepeat+1
+            continue
+        fi
+
+        previous_log="$log"
+        if [[ $logrepeat -gt 1 ]];then
+            logoutput+="Last Log repeated ${logrepeat} times\n"
+            logrepeat=0
+        fi
+
+        logoutput+="$log\n"
+    done <<< "$loginput"
 }

 # will get the latest release download from a github repo
 downloadURLFromGit() { # $1 git user name, $2 git repo name
    gitusername=${1?:"no git user name"}
    gitreponame=${2?:"no git repo name"}
-    
+
    if [[ $type == "pkgInDmg" ]]; then
        filetype="dmg"
    elif [[ $type == "pkgInZip" ]]; then
@@ -86,7 +163,7 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
    else
        filetype=$type
    fi
-    
+
    if [ -n "$archiveName" ]; then
    downloadURL=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
    | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }")
@@ -95,8 +172,7 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
    | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
    fi
    if [ -z "$downloadURL" ]; then
-        cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame"
-        #exit 9
+        cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame" ERROR
    else
        echo "$downloadURL"
        return 0
@@ -108,7 +184,7 @@ versionFromGit() {
    # $1 git user name, $2 git repo name
    gitusername=${1?:"no git user name"}
    gitreponame=${2?:"no git repo name"}
-        
+
    appNewVersion=$(curl --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | grep tag_name | cut -d '"' -f 4 | sed 's/[^0-9\.]//g')
    if [ -z "$appNewVersion" ]; then
        printlog "could not retrieve version number for $gitusername/$gitreponame"
@@ -122,7 +198,7 @@ versionFromGit() {

 # Handling of differences in xpath between Catalina and Big Sur
 xpath() {
-	# the xpath tool changes in Big Sur and now requires the `-e` option	
+	# the xpath tool changes in Big Sur and now requires the `-e` option
 	if [[ $(sw_vers -buildVersion) > "20A" ]]; then
 		/usr/bin/xpath -e $@
 		# alternative: switch to xmllint (which is not perl)
@@ -142,7 +218,7 @@ getAppVersion() {
        printlog "Custom App Version detection is used, found $appversion"
        return
    fi
-    
+
    # pkgs contains a version number, then we don't have to search for an app
    if [[ $packageID != "" ]]; then
        appversion="$(pkgutil --pkg-info-plist ${packageID} 2>/dev/null | grep -A 1 pkg-version | tail -1 | sed -E 's/.*>([0-9.]*)<.*/\1/g')"
@@ -154,7 +230,7 @@ getAppVersion() {
            printlog "No version found using packageID $packageID"
        fi
    fi
-    
+
    # get app in /Applications, or /Applications/Utilities, or find using Spotlight
    if [[ -d "/Applications/$appName" ]]; then
        applist="/Applications/$appName"
@@ -164,9 +240,9 @@ getAppVersion() {
        applist=$(mdfind "kind:application $appName" -0 )
    fi
    if [[ -z applist ]]; then
-        printlog "No previous app found"
+        printlog "No previous app found" DEBUG
    else
-        printlog "App(s) found: ${applist}"
+        printlog "App(s) found: ${applist}" DEBUG
    fi

    appPathArray=( ${(0)applist} )
@@ -177,7 +253,7 @@ getAppVersion() {
            installedAppPath=$filteredAppPaths[1]
            #appversion=$(mdls -name kMDItemVersion -raw $installedAppPath )
            appversion=$(defaults read $installedAppPath/Contents/Info.plist $versionKey) #Not dependant on Spotlight indexing
-            printlog "found app at $installedAppPath, version $appversion"
+            printlog "found app at $installedAppPath, version $appversion, on versionKey $versionKey"
            updateDetected="YES"
            # Is current app from App Store
            if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then
@@ -186,7 +262,7 @@ getAppVersion() {
                    printlog "Replacing App Store apps, no matter the version"
                    appversion=0
                else
-                    cleanupAndExit 1 "App previously installed from App Store, and we respect that"
+                    cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR
                fi
            fi
        else
@@ -198,9 +274,9 @@ getAppVersion() {
 }

 checkRunningProcesses() {
-    # don't check in DEBUG mode
-    if [[ $DEBUG -ne 0 ]]; then
-        printlog "DEBUG mode, not checking for blocking processes"
+    # don't check in DEBUG mode 1
+    if [[ $DEBUG -eq 1 ]]; then
+        printlog "DEBUG mode 1, not checking for blocking processes" DEBUG
        return
    fi

@@ -211,7 +287,7 @@ checkRunningProcesses() {
            if pgrep -xq "$x"; then
                printlog "found blocking process $x"
                appClosed=1
-                
+
                case $BLOCKING_PROCESS_ACTION in
                    quit|quit_kill)
                        printlog "telling app $x to quit"
@@ -233,7 +309,7 @@ checkRunningProcesses() {
                    prompt_user|prompt_user_then_kill)
                      button=$(displaydialog "Quit “$x” to continue updating? (Leave this dialogue if you want to activate this update later)." "The application “$x” needs to be updated.")
                      if [[ $button = "Not Now" ]]; then
-                        cleanupAndExit 10 "user aborted update"
+                        cleanupAndExit 10 "user aborted update" ERROR
                      else
                        if [[ $i > 2 && $BLOCKING_PROCESS_ACTION = "prompt_user_then_kill" ]]; then
                          printlog "Changing BLOCKING_PROCESS_ACTION to kill"
@@ -278,7 +354,7 @@ checkRunningProcesses() {
                      fi
                      ;;
                    silent_fail)
-                      cleanupAndExit 12 "blocking process '$x' found, aborting"
+                      cleanupAndExit 12 "blocking process '$x' found, aborting" ERROR
                      ;;
                esac

@@ -289,28 +365,28 @@ checkRunningProcesses() {
    done

    if [[ $countedProcesses -ne 0 ]]; then
-        cleanupAndExit 11 "could not quit all processes, aborting..."
+        cleanupAndExit 11 "could not quit all processes, aborting..." ERROR
    fi

-    printlog "no more blocking processes, continue with update"
+    printlog "no more blocking processes, continue with update" REQ
 }

 reopenClosedProcess() {
    # If Installomator closed any processes, let's get the app opened again
    # credit: Søren Theilgaard (@theilgaard)
-    
+
    # don't reopen if REOPEN is not "yes"
    if [[ $REOPEN != yes ]]; then
        printlog "REOPEN=no, not reopening anything"
        return
    fi

-    # don't reopen in DEBUG mode
-    if [[ $DEBUG -ne 0 ]]; then
-        printlog "DEBUG mode, not reopening anything"
+    # don't reopen in DEBUG mode 1
+    if [[ $DEBUG -eq 1 ]]; then
+        printlog "DEBUG mode 1, not reopening anything" DEBUG
        return
    fi
-    
+
    if [[ $appClosed == 1 ]]; then
        printlog "Telling app $appName to open"
        #runAsUser osascript -e "tell app \"$appName\" to open"
@@ -320,7 +396,7 @@ reopenClosedProcess() {
        processuser=$(ps aux | grep -i "${appName}" | grep -vi "grep" | awk '{print $1}')
        printlog "Reopened ${appName} as $processuser"
    else
-        printlog "App not closed, so no reopen."
+        printlog "App not closed, so no reopen." DEBUG
    fi
 }

@@ -330,89 +406,116 @@ installAppWithPath() { # $1: path to app to install in $targetDir

    # check if app exists
    if [ ! -e "$appPath" ]; then
-        cleanupAndExit 8 "could not find: $appPath"
+        cleanupAndExit 8 "could not find: $appPath" DEBUG
    fi

    # verify with spctl
-    printlog "Verifying: $appPath"
-    if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
-        cleanupAndExit 4 "Error verifying $appPath"
-    fi
+    printlog "Verifying: $appPath" INFO
+    printlog "App size: $(du -sh "$appPath")" DEBUG
+    appVerify=$(spctl -a -vv "$appPath" 2>&1 )
+    appVerifyStatus=$(echo $?)
+    teamID=$(echo $appVerify | awk '/origin=/ {print $NF }' | tr -d '()' )
+    deduplicatelogs "$appVerify"

-    printlog "Team ID matching: $teamID (expected: $expectedTeamID )"
+    if [[ $appVerifyStatus -ne 0 ]] ; then
+    #if ! teamID=$(spctl -a -vv "$appPath" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()' ); then
+        cleanupAndExit 4 "Error verifying $appPath error:\n$logoutput" ERROR
+    fi
+    printlog "Debugging enabled, App Verification output was:\n$logoutput" DEBUG
+    printlog "Team ID matching: $teamID (expected: $expectedTeamID )" INFO

    if [ "$expectedTeamID" != "$teamID" ]; then
-        cleanupAndExit 5 "Team IDs do not match"
+        cleanupAndExit 5 "Team IDs do not match" ERROR
    fi

-    # versioncheck
-    # credit: Søren Theilgaard (@theilgaard)
+    # app versioncheck
    appNewVersion=$(defaults read $appPath/Contents/Info.plist $versionKey)
    if [[ -n $appNewVersion && $appversion == $appNewVersion ]]; then
-        printlog "Downloaded version of $name is $appNewVersion, same as installed."
+        printlog "Downloaded version of $name is $appNewVersion on versionKey $versionKey, same as installed."
        if [[ $INSTALL != "force" ]]; then
            message="$name, version $appNewVersion, is the latest version."
            if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
                printlog "notifying"
                displaynotification "$message" "No update for $name!"
            fi
-            cleanupAndExit 0 "No new version to install"
+            cleanupAndExit 0 "No new version to install" INFO
        else
            printlog "Using force to install anyway."
        fi
    else
-        printlog "Downloaded version of $name is $appNewVersion (replacing version $appversion)."
+        printlog "Downloaded version of $name is $appNewVersion on versionKey $versionKey (replacing version $appversion)."
    fi

-    # skip install for DEBUG
-    if [ "$DEBUG" -ne 0 ]; then
-        printlog "DEBUG enabled, skipping remove, copy and chown steps"
+    # macOS versioncheck
+    minimumOSversion=$(defaults read $appPath/Contents/Info.plist LSMinimumSystemVersion 2>/dev/null )
+    if [[ -n $minimumOSversion && $minimumOSversion =~ '[0-9.]*' ]]; then
+        printlog "App has LSMinimumSystemVersion: $minimumOSversion"
+        if ! is-at-least $minimumOSversion $installedOSversion; then
+            printlog "App requires higher System Version than installed: $installedOSversion"
+            message="Cannot install $name, version $appNewVersion, as it is not compatible with the running system version."
+            if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
+                printlog "notifying"
+                displaynotification "$message" "Error updating $name!"
+            fi
+            cleanupAndExit 6 "Installed macOS is too old for this app." INFO
+        fi
+    fi
+
+    # skip install for DEBUG 1
+    if [ "$DEBUG" -eq 1 ]; then
+        printlog "DEBUG mode 1 enabled, skipping remove, copy and chown steps" DEBUG
        return 0
    fi

-    # check for root
-    if [ "$(whoami)" != "root" ]; then
-        # not running as root
-        cleanupAndExit 6 "not running as root, exiting"
+    # skip install for DEBUG 2
+    if [ "$DEBUG" -eq 2 ]; then
+        printlog "DEBUG mode 2 enabled, not installing anything, exiting" DEBUG
+        cleanupAndExit 0
    fi
-    
+
    # Test if variable CLIInstaller is set
    if [[ -z $CLIInstaller ]]; then
-    
+
        # remove existing application
        if [ -e "$targetDir/$appName" ]; then
-            printlog "Removing existing $targetDir/$appName"
-            rm -Rf "$targetDir/$appName"
+            printlog "Removing existing $targetDir/$appName" DEBUG
+            deleteAppOut=$(rm -Rfv "$targetDir/$appName" 2>&1)
+            tempName="$targetDir/$appName"
+            tempNameLength=$((${#tempName} + 10))
+            deleteAppOut=$(echo $deleteAppOut | cut -c 1-$tempNameLength)
+            deduplicatelogs "$deleteAppOut"
+            printlog "Debugging enabled, App removing output was:\n$logoutput" DEBUG
        fi

        # copy app to /Applications
        printlog "Copy $appPath to $targetDir"
        if ! ditto "$appPath" "$targetDir/$appName"; then
-            cleanupAndExit 7 "Error while copying"
+            cleanupAndExit 7 "Error while copying" ERROR
        fi

        # set ownership to current user
-        if [ "$currentUser" != "loginwindow" ]; then
+        if [[ "$currentUser" != "loginwindow" && $SYSTEMOWNER -ne 1 ]]; then
            printlog "Changing owner to $currentUser"
            chown -R "$currentUser" "$targetDir/$appName"
        else
-            printlog "No user logged in, not changing user"
+            printlog "No user logged in or SYSTEMOWNER=1, setting owner to root:wheel" 
+            chown -R root:wheel "$targetDir/$appName"
        fi

    elif [[ ! -z $CLIInstaller ]]; then
        mountname=$(dirname $appPath)
-        printlog "CLIInstaller exists, running installer command $mountname/$CLIInstaller $CLIArguments" #INFO
+        printlog "CLIInstaller exists, running installer command $mountname/$CLIInstaller $CLIArguments" INFO

        CLIoutput=$("$mountname/$CLIInstaller" "${CLIArguments[@]}" 2>&1)
        CLIstatus=$(echo $?)
-        logoutput="$CLIoutput" # dedupliatelogs "$CLIoutput"
+        deduplicatelogs "$CLIoutput"

        if [ $CLIstatus -ne 0 ] ; then
-            cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error:\n$logoutput" #ERROR
+            cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error:\n$logoutput" ERROR
        else
-            printlog "Succesfully ran $mountname/$CLIInstaller $CLIArguments"
+            printlog "Succesfully ran $mountname/$CLIInstaller $CLIArguments" INFO
        fi
-        printlog "Debugging enabled, update tool output was:\n$logoutput" #DEBUG
+        printlog "Debugging enabled, update tool output was:\n$logoutput" DEBUG
    fi

 }
@@ -421,16 +524,21 @@ mountDMG() {
    # mount the dmg
    printlog "Mounting $tmpDir/$archiveName"
    # always pipe 'Y\n' in case the dmg requires an agreement
-    if ! dmgmount=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
-        cleanupAndExit 3 "Error mounting $tmpDir/$archiveName"
+    dmgmountOut=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly )
+    dmgmountStatus=$(echo $?)
+    dmgmount=$(echo $dmgmountOut | tail -n 1 | cut -c 54- )
+    deduplicatelogs "$dmgmountOut"
+    
+    if [[ $dmgmountStatus -ne 0 ]] ; then
+    #if ! dmgmount=$(echo 'Y'$'\n' | hdiutil attach "$tmpDir/$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
+        cleanupAndExit 3 "Error mounting $tmpDir/$archiveName error:\n$logoutput" ERROR
    fi
-
    if [[ ! -e $dmgmount ]]; then
-        printlog "Error mounting $tmpDir/$archiveName"
-        cleanupAndExit 3
+        cleanupAndExit 3 "Error accessing mountpoint for $tmpDir/$archiveName error:\n$logoutput" ERROR
    fi
-
-    printlog "Mounted: $dmgmount"
+    printlog "Debugging enabled, dmgmount output was:\n$logoutput" DEBUG
+    
+    printlog "Mounted: $dmgmount" INFO
 }

 installFromDMG() {
@@ -441,34 +549,44 @@ installFromDMG() {
 installFromPKG() {
    # verify with spctl
    printlog "Verifying: $archiveName"
+    printlog "File list: $(ls -lh "$archiveName")" DEBUG
+    printlog "File type: $(file "$archiveName")" DEBUG
+    spctlOut=$(spctl -a -vv -t install "$archiveName" 2>&1 )
+    spctlStatus=$(echo $?)
+    printlog "spctlOut is $spctlOut" DEBUG
    
-    if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then
-        printlog "Error verifying $archiveName"
-        cleanupAndExit 4
+    teamID=$(echo $spctlOut | awk -F '(' '/origin=/ {print $2 }' | tr -d '()' )
+    # Apple signed software has no teamID, grab entire origin instead
+    if [[ -z $teamID ]]; then
+        teamID=$(echo $spctlOut | awk -F '=' '/origin=/ {print $NF }')
    fi
+
+    deduplicatelogs "$spctlOut"
    
-    teamID=$(echo $spctlout | awk -F '(' '/origin=/ {print $2 }' | tr -d '()' )
+    if [[ $spctlStatus -ne 0 ]] ; then
+    #if ! spctlout=$(spctl -a -vv -t install "$archiveName" 2>&1 ); then
+        cleanupAndExit 4 "Error verifying $archiveName error:\n$logoutput" ERROR
+    fi

    # Apple signed software has no teamID, grab entire origin instead
    if [[ -z $teamID ]]; then
        teamID=$(echo $spctlout | awk -F '=' '/origin=/ {print $NF }')
    fi

-
    printlog "Team ID: $teamID (expected: $expectedTeamID )"

    if [ "$expectedTeamID" != "$teamID" ]; then
-        printlog "Team IDs do not match!"
-        cleanupAndExit 5
+        cleanupAndExit 5 "Team IDs do not match!" ERROR
    fi

    # Check version of pkg to be installed if packageID is set
    if [[ $packageID != "" && $appversion != "" ]]; then
        printlog "Checking package version."
-        pkgutil --expand "$archiveName" "$archiveName"_pkg
-        #printlog "$(cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null)"
-        appNewVersion=$(cat "$archiveName"_pkg/Distribution | xpath '//installer-gui-script/pkg-ref[@id][@version]' 2>/dev/null | grep -i "$packageID" | tr ' ' '\n' | grep -i version | cut -d \" -f 2) #sed -E 's/.*\"([0-9.]*)\".*/\1/g'
-        rm -r "$archiveName"_pkg
+        baseArchiveName=$(basename $archiveName)
+        expandedPkg="$tmpDir/${baseArchiveName}_pkg"
+        pkgutil --expand "$archiveName" "$expandedPkg"
+        appNewVersion=$(cat "$expandedPkg"/Distribution | xpath 'string(//installer-gui-script/pkg-ref[@id][@version]/@version)' 2>/dev/null )
+        rm -r "$expandedPkg"
        printlog "Downloaded package $packageID version $appNewVersion"
        if [[ $appversion == $appNewVersion ]]; then
            printlog "Downloaded version of $name is the same as installed."
@@ -478,47 +596,63 @@ installFromPKG() {
                    printlog "notifying"
                    displaynotification "$message" "No update for $name!"
                fi
-                cleanupAndExit 0 "No new version to install"
+                cleanupAndExit 0 "No new version to install" INFO
            else
                printlog "Using force to install anyway."
            fi
        fi
    fi
-    
-    # skip install for DEBUG
-    if [ "$DEBUG" -ne 0 ]; then
-        printlog "DEBUG enabled, skipping installation"
+
+    # skip install for DEBUG 1
+    if [ "$DEBUG" -eq 1 ]; then
+        printlog "DEBUG enabled, skipping installation" DEBUG
        return 0
    fi

-    # check for root
-    if [ "$(whoami)" != "root" ]; then
-        # not running as root
-        cleanupAndExit 6 "not running as root, exiting"
+    # skip install for DEBUG 2
+    if [ "$DEBUG" -eq 2 ]; then
+        cleanupAndExit 0 "DEBUG mode 2 enabled, exiting" DEBUG
    fi

    # install pkg
    printlog "Installing $archiveName to $targetDir"
-    if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
-        printlog "error installing $archiveName"
-        cleanupAndExit 9
+    pkgInstall=$(installer -verbose -dumplog -pkg "$archiveName" -tgt "$targetDir" 2>&1)
+    pkgInstallStatus=$(echo $?)
+    sleep 1
+    pkgEndTime=$(date "+$LogDateFormat")
+    pkgInstall+=$(echo "\nOutput of /var/log/install.log below this line.\n")
+    pkgInstall+=$(echo "----------------------------------------------------------\n")
+    pkgInstall+=$(awk -v "b=$starttime" -v "e=$pkgEndTime" -F ',' '$1 >= b && $1 <= e' /var/log/install.log)
+    deduplicatelogs "$pkgInstall"
+
+    if [[ $pkgInstallStatus -ne 0 ]] && [[ $logoutput == *"requires Rosetta 2"* ]] && [[ $rosetta2 == no ]]; then
+        printlog "Package requires Rosetta 2, Installing Rosetta 2 and Installing Package" INFO
+        /usr/sbin/softwareupdate --install-rosetta --agree-to-license
+        rosetta2=yes
+        installFromPKG
    fi
+
+    if [[ $pkginstallstatus -ne 0 ]] ; then
+    #if ! installer -pkg "$archiveName" -tgt "$targetDir" ; then
+        cleanupAndExit 9 "Error installing $archiveName error:\n$logoutput" ERROR
+    fi
+    printlog "Debugging enabled, installer output was:\n$logoutput" DEBUG
 }

 installFromZIP() {
    # unzip the archive
    printlog "Unzipping $archiveName"
-    
+
    # tar -xf "$archiveName"

    # note: when you expand a zip using tar in Mojave the expanded
    # app will never pass the spctl check

    # unzip -o -qq "$archiveName"
-    
+
    # note: githubdesktop fails spctl verification when expanded
    # with unzip
-    
+
    ditto -x -k "$archiveName" "$tmpDir"
    installAppWithPath "$tmpDir/$appName"
 }
@@ -535,16 +669,27 @@ installPkgInDmg() {
    # locate pkg in dmg
    if [[ -z $pkgName ]]; then
        # find first file ending with 'pkg'
-        findfiles=$(find "$dmgmount" -iname "*.pkg" -maxdepth 1  )
+        findfiles=$(find "$dmgmount" -iname "*.pkg" -type f -maxdepth 1  )
        filearray=( ${(f)findfiles} )
        if [[ ${#filearray} -eq 0 ]]; then
-            cleanupAndExit 20 "couldn't find pkg in dmg $archiveName"
+            cleanupAndExit 20 "couldn't find pkg in dmg $archiveName" ERROR
        fi
        archiveName="${filearray[1]}"
        printlog "found pkg: $archiveName"
    else
-        # it is now safe to overwrite archiveName for installFromPKG
-        archiveName="$dmgmount/$pkgName"
+        if ls "$tmpDir/$pkgName" ; then
+            archiveName="$tmpDir/$pkgName"
+        else
+            # try searching for pkg
+            findfiles=$(find "$tmpDir" -iname "$pkgName")
+            filearray=( ${(f)findfiles} )
+            if [[ ${#filearray} -eq 0 ]]; then
+                cleanupAndExit 20 "couldn't find pkg “$pkgName” in zip $archiveName" ERROR
+            fi
+            # it is now safe to overwrite archiveName for installFromPKG
+            archiveName="${filearray[1]}"
+            printlog "found pkg: $archiveName"
+        fi
    fi

    # installFromPkgs
@@ -559,17 +704,28 @@ installPkgInZip() {
    # locate pkg in zip
    if [[ -z $pkgName ]]; then
        # find first file ending with 'pkg'
-        findfiles=$(find "$tmpDir" -iname "*.pkg" -maxdepth 2  )
+        findfiles=$(find "$tmpDir" -iname "*.pkg" -type f -maxdepth 2  )
        filearray=( ${(f)findfiles} )
        if [[ ${#filearray} -eq 0 ]]; then
-            cleanupAndExit 20 "couldn't find pkg in zip $archiveName"
+            cleanupAndExit 20 "couldn't find pkg in zip $archiveName" ERROR
        fi
-        archiveName="${filearray[1]}"
        # it is now safe to overwrite archiveName for installFromPKG
+        archiveName="${filearray[1]}"
        printlog "found pkg: $archiveName"
    else
-        # it is now safe to overwrite archiveName for installFromPKG
-        archiveName="$tmpDir/$pkgName"
+        if [[ -s "$tmpDir/$pkgName" ]]; then
+            archiveName="$tmpDir/$pkgName"
+        else
+            # try searching for pkg
+            findfiles=$(find "$tmpDir" -iname "$pkgName")
+            filearray=( ${(f)findfiles} )
+            if [[ ${#filearray} -eq 0 ]]; then
+                cleanupAndExit 20 "couldn't find pkg “$pkgName” in zip $archiveName" ERROR
+            fi
+            # it is now safe to overwrite archiveName for installFromPKG
+            archiveName="${filearray[1]}"
+            printlog "found pkg: $archiveName"
+        fi
    fi

    # installFromPkgs
@@ -587,7 +743,7 @@ installAppInDmgInZip() {
        findfiles=$(find "$tmpDir" -iname "*.dmg" -maxdepth 2  )
        filearray=( ${(f)findfiles} )
        if [[ ${#filearray} -eq 0 ]]; then
-            cleanupAndExit 20 "couldn't find dmg in zip $archiveName"
+            cleanupAndExit 20 "couldn't find dmg in zip $archiveName" ERROR
        fi
        archiveName="$(basename ${filearray[1]})"
        # it is now safe to overwrite archiveName for installFromDMG
@@ -606,12 +762,29 @@ runUpdateTool() {
    if [[ -x $updateTool ]]; then
        printlog "running $updateTool $updateToolArguments"
        if [[ -n $updateToolRunAsCurrentUser ]]; then
-            runAsUser $updateTool ${updateToolArguments}
+            updateOutput=$(runAsUser $updateTool ${updateToolArguments} 2>&1)
+            updateStatus=$(echo $?)
        else
-            $updateTool ${updateToolArguments}
+            updateOutput=$($updateTool ${updateToolArguments} 2>&1)
+            updateStatus=$(echo $?)
        fi
-        if [[ $? -ne 0 ]]; then
-            cleanupAndExit 15 "Error running $updateTool"
+        sleep 1
+        updateEndTime=$(date "+$updateToolLogDateFormat")
+        deduplicatelogs $updateOutput
+        if [[ -n $updateToolLog ]]; then
+            updateOutput+=$(echo "Output of Installer log of $updateToolLog below this line.\n")
+            updateOutput+=$(echo "----------------------------------------------------------\n")
+            updateOutput+=$(awk -v "b=$updatestarttime" -v "e=$updateEndTime" -F ',' '$1 >= b && $1 <= e' $updateToolLog)
+        fi
+
+        if [[ $updateStatus -ne 0 ]]; then
+            printlog "Error running $updateTool, Procceding with normal installation. Exit Status: $updateStatus Error:\n$logoutput" WARN
+            return 1
+            if [[ $type == updateronly ]]; then
+                cleanupAndExit 77 "No Download URL Set, this is an update only application and the updater failed" WARN
+            fi
+        elif [[ $updateStatus -eq 0 ]]; then
+            printlog "Debugging enabled, update tool output was:\n$logoutput" DEBUG
        fi
    else
        printlog "couldn't find $updateTool, continuing normally"
@@ -643,4 +816,30 @@ finishing() {
    fi
 }

+# Detect if there is an app actively making a display sleep assertion, e.g.
+# KeyNote, PowerPoint, Zoom, or Webex.
+# See: https://developer.apple.com/documentation/iokit/iopmlib_h/iopmassertiontypes
+hasDisplaySleepAssertion() {
+    # Get the names of all apps with active display sleep assertions
+    local apps="$(/usr/bin/pmset -g assertions | /usr/bin/awk '/NoDisplaySleepAssertion | PreventUserIdleDisplaySleep/ && match($0,/\(.+\)/) && ! /coreaudiod/ {gsub(/^.*\(/,"",$0); gsub(/\).*$/,"",$0); print};')"
+
+    if [[ ! "${apps}" ]]; then
+        # No display sleep assertions detected
+        return 1
+    fi
+
+    # Create an array of apps that need to be ignored
+    local ignore_array=("${(@s/,/)IGNORE_DND_APPS}")
+
+    for app in ${(f)apps}; do
+        if (( ! ${ignore_array[(Ie)${app}]} )); then
+            # Relevant app with display sleep assertion detected
+            printlog "Display sleep assertion detected by ${app}."
+            return 0
+        fi
+    done
+
+    # No relevant display sleep assertion detected
+    return 1
+}

--- a/fragments/header.sh
+++ b/fragments/header.sh
@@ -20,9 +20,11 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin

 # NOTE: adjust these variables:

-# set to 0 for production, 1 for debugging
+# set to 0 for production, 1 or 2 for debugging
 # while debugging, items will be downloaded to the parent directory of this script
 # also no actual installation will be performed
+# debug mode 1 will download to the directory the script is run in, but will not check the version 
+# debug mode 2 will download to the temp directory, check for blocking processes, check the version, but will not install anything or remove the current version
 DEBUG=1

 # notify behavior
@@ -37,29 +39,36 @@ NOTIFY=success
 BLOCKING_PROCESS_ACTION=tell_user
 # options:
 #   - ignore       continue even when blocking processes are found
-#   - quit         app will be told to quit nicely, if running
+#   - quit         app will be told to quit nicely if running
 #   - quit_kill    told to quit twice, then it will be killed
-#                  Could be great for service apps, if they do not respawn
+#                  Could be great for service apps if they do not respawn
 #   - silent_fail  exit script without prompt or installation
-#   - prompt_user  show a user dialog for each blocking process found
-#                  abort after three attempts to quit
-#                  (only if user accepts to quit the apps, otherwise
-#                  the update is cancelled).
+#   - prompt_user  show a user dialog for each blocking process found,
+#                  user can choose "Quit and Update" or "Not Now".
+#                  When "Quit and Update" is chosen, blocking process
+#                  will be told to quit. Installomator will wait 30 seconds
+#                  before checking again in case Save dialogs etc are being responded to.
+#                  Installomator will abort if quitting after three tries does not succeed.
+#                  "Not Now" will exit Installomator.
 #   - prompt_user_then_kill
 #                  show a user dialog for each blocking process found,
-#                  attempt to quit two times, kill the process finally
+#                  user can choose "Quit and Update" or "Not Now".
+#                  When "Quit and Update" is chosen, blocking process
+#                  will be terminated. Installomator will abort if terminating
+#                  after two tries does not succeed. "Not Now" will exit Installomator.
 #   - prompt_user_loop
 #                  Like prompt-user, but clicking "Not Now", will just wait an hour,
 #                  and then it will ask again.
 #                  WARNING! It might block the MDM agent on the machine, as
-#                  the scripts gets stuct in waiting until the hour has passed,
+#                  the script will not exit, it will pause until the hour has passed,
 #                  possibly blocking for other management actions in this time.
 #   - tell_user    User will be showed a notification about the important update,
-#                  but user is only allowed to quit and continue, and then we
-#                  ask the app to quit.
+#                  but user is only allowed to Quit and Continue, and then we
+#                  ask the app to quit. This is default.
 #   - tell_user_then_kill
-#                  Show dialog 2 times, and if the quitting fails, the
-#                  blocking processes will be killed.
+#                  User will be showed a notification about the important update,
+#                  but user is only allowed to Quit and Continue. If the quitting fails,
+#                  the blocking processes will be terminated.
 #   - kill         kill process without prompting or giving the user a chance to save


@@ -79,18 +88,25 @@ LOGO=appstore
 # App Store apps handling
 IGNORE_APP_STORE_APPS=no
 # options:
-#  - no            If installed app is from App Store (which include VPP installed apps)
-#                  it will not be touched, no matter it's version (default)
-#  - yes           Replace App Store (and VPP) version of app and handle future
+#  - no            If the installed app is from App Store (which include VPP installed apps)
+#                  it will not be touched, no matter its version (default)
+#  - yes           Replace App Store (and VPP) version of the app and handle future
 #                  updates using Installomator, even if latest version.
 #                  Shouldn’t give any problems for the user in most cases.
-#                  Known bad example: Slack will loose all settings.
+#                  Known bad example: Slack will lose all settings.

+# Owner of copied apps
+SYSTEMOWNER=0
+# options:
+#  - 0             Current user will be owner of copied apps, just like if they
+#                  installed it themselves (default).
+#  - 1             root:wheel will be set on the copied app.
+#                  Useful for shared machines.

 # install behavior
 INSTALL=""
 # options:
-#  -               When not set, software will only be installed
+#  -               When not set, the software will only be installed
 #                  if it is newer/different in version
 #  - force         Install even if it’s the same version

@@ -98,9 +114,29 @@ INSTALL=""
 # Re-opening of closed app
 REOPEN="yes"
 # options:
-#  - yes           App wil be reopened if it was closed
+#  - yes           App will be reopened if it was closed
 #  - no            App not reopened

+# Only let Installomator return the name of the label
+# RETURN_LABEL_NAME=0
+# options:
+#   - 1      Installomator will return the name of the label and exit, so last line of
+#            output will be that name. When Installomator is locally installed and we
+#            use DEPNotify, then DEPNotify can present a more nice name to the user,
+#            instead of just the label name.
+
+
+# Interrupt Do Not Disturb (DND) full screen apps
+INTERRUPT_DND="yes"
+# options:
+#  - yes           Script will run without checking for DND full screen apps.
+#  - no            Script will exit when an active DND full screen app is detected.
+
+# Comma separated list of app names to ignore when evaluating DND
+IGNORE_DND_APPS=""
+# example that will ignore browsers when evaluating DND:
+# IGNORE_DND_APPS="firefox,Google Chrome,Safari,Microsoft Edge,Opera,Amphetamine,caffeinate"
+

 # NOTE: How labels work

@@ -124,7 +160,7 @@ REOPEN="yes"
 #
 # - packageID: (optional)
 #   The package ID of a pkg
-#   If given, will be used to find version of installed software, instead of searching for an app.
+#   If given, will be used to find the version of installed software, instead of searching for an app.
 #   Usefull if a pkg does not install an app.
 #   See label installomator_st
 #
@@ -132,9 +168,15 @@ REOPEN="yes"
 #   URL to download the dmg.
 #   Can be generated with a series of commands (see BBEdit for an example).
 #
+# - curlOptions: (array, optional)
+#   Options to the curl command, needed for curl to be able to download the software.
+#   Usually used for adding extra headers that some servers need in order to serve the file.
+#   curlOptions=( -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" )
+#   (See “mocha”-labels, for examples on labels, and buildLabel.sh for header-examples.)
+#
 # - appNewVersion: (optional)
 #   Version of the downloaded software.
-#   If given, it will be compared to installed version, to see if download is different.
+#   If given, it will be compared to the installed version, to see if the download is different.
 #   It does not check for newer or not, only different.
 #
 # - versionKey: (optional)
@@ -188,7 +230,7 @@ REOPEN="yes"
 #     blockingProcesses=( NONE )
 #
 # - pkgName: (optional, only used for pkgInDmg, dmgInZip, and appInDmgInZip)
-#   File name of the pkg/dmg file _inside_ the dmg or zip
+#   File name or path to the pkg/dmg file _inside_ the dmg or zip.
 #   When not given the pkgName is derived from the $name
 #
 # - updateTool:
@@ -205,10 +247,10 @@ REOPEN="yes"
 #
 # - CLIInstaller:
 # - CLIArguments:
-#   If the downloaded dmg is actually an installer that we can call using CLI, we can
+#   If the downloaded dmg is an installer that we can call using CLI, we can
 #   use these two variables for what to call.
 #   We need to define `name` for the installed app (to be version checked), as well as
-#   `installerTool` for the installer app (if named differently that `name`. Installomator
+#   `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`
 #   For most installations `CLIInstaller` should contain the `installerTool` for the CLI call
@@ -222,3 +264,40 @@ REOPEN="yes"
 #   installer that should be located after mounting/expanding the downloaded archive.
 #   See label adobecreativeclouddesktop
 #
+### Logging
+# Logging behavior
+LOGGING="INFO"
+# options:
+#   - DEBUG     Everything is logged
+#   - INFO      (default) normal logging level
+#   - WARN      only warning
+#   - ERROR     only errors
+#   - REQ       ????
+
+# MDM profile name
+MDMProfileName=""
+# options:
+#   - MDM Profile               Addigy has this name on the profile
+#   - Mosyle Corporation MDM    Mosyle uses this name on the profile
+# From the LOGO variable we can know if Addigy og Mosyle is used, so if that variable
+# is either of these, and this variable is empty, then we will auto detect this.
+
+# Datadog logging used
+datadogAPI=""
+# Simply add your own API key for this in order to have logs sent to Datadog
+# See more here: https://www.datadoghq.com/product/log-management/
+
+# Log Date format used when parsing logs for debugging, this is the default used by
+# install.log, override this in the case statements if you need something custom per
+# application (See adobeillustrator).  Using stadard GNU Date formatting.
+LogDateFormat="%Y-%m-%d %H:%M:%S"
+
+# Get the start time for parsing install.log if we fail.
+starttime=$(date "+$LogDateFormat")
+
+# Check if we have rosetta installed
+if [[ $(/usr/bin/arch) == "arm64" ]]; then
+    if ! arch -x86_64 /usr/bin/true >/dev/null 2>&1; then # pgrep oahd >/dev/null 2>&1
+        rosetta2=no
+    fi
+fi
--- a/fragments/labels/androidfiletransfer.sh
+++ b/fragments/labels/androidfiletransfer.sh
@@ -1,5 +1,4 @@
 androidfiletransfer)
-    #credit: Sam Ess (saess-sep)
    name="Android File Transfer"
    type="dmg"
    downloadURL="https://dl.google.com/dl/androidjumper/mtp/current/AndroidFileTransfer.dmg"
--- a/fragments/labels/applenyfonts.sh
+++ b/fragments/labels/applenyfonts.sh
@@ -3,5 +3,5 @@ applenyfonts)
    type="pkgInDmg"
    downloadURL="https://devimages-cdn.apple.com/design/resources/download/NY.dmg"
    packageID="com.apple.pkg.NYFonts"
-    expectedTeamID="Development Update"
+    expectedTeamID="Software Update"
    ;;
--- a/fragments/labels/applesfarabic.sh
+++ b/fragments/labels/applesfarabic.sh
@@ -0,0 +1,7 @@
+applesfarabic)
+    name="San Francisco Arabic"
+    type="pkgInDmg"
+    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Arabic.dmg"
+    packageID="com.apple.pkg.SFArabicFonts"
+    expectedTeamID="Software Update"
+    ;;
--- a/fragments/labels/applesfcompact.sh
+++ b/fragments/labels/applesfcompact.sh
@@ -3,5 +3,5 @@ applesfcompact)
    type="pkgInDmg"
    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Compact.dmg"
    packageID="com.apple.pkg.SanFranciscoCompact"
-    expectedTeamID="Development Update"
+    expectedTeamID="Software Update"
    ;;
--- a/fragments/labels/applesfpro.sh
+++ b/fragments/labels/applesfpro.sh
@@ -3,5 +3,5 @@ applesfpro)
    type="pkgInDmg"
    downloadURL="https://devimages-cdn.apple.com/design/resources/download/SF-Pro.dmg"
    packageID="com.apple.pkg.SanFranciscoPro"
-    expectedTeamID="Development Update"
+    expectedTeamID="Software Update"
    ;;
--- a/fragments/labels/applesfsymbols.sh
+++ b/fragments/labels/applesfsymbols.sh
@@ -2,7 +2,7 @@ applesfsymbols|\
 sfsymbols)
    name="SF Symbols"
    type="pkgInDmg"
-    downloadURL=$( curl -fs "https://developer.apple.com/sf-symbols/" | grep -oe "https.*\.dmg" | head -1 )
-    appNewVersion=$( echo "$downloadURL" | head -1 | sed -E 's/.*SF-Symbols-([0-9.]*)\..*/\1/g')
+    downloadURL=$( curl -fs "https://developer.apple.com/sf-symbols/" | grep -oe "https.*Symbols.*\.dmg" | head -1 )
+    appNewVersion=$( echo "$downloadURL" | sed -E 's/.*SF-Symbols-([0-9.]*)\..*/\1/g')
    expectedTeamID="Software Update"
    ;;
--- a/fragments/labels/authydesktop.sh
+++ b/fragments/labels/authydesktop.sh
@@ -1,7 +1,7 @@
 authydesktop)
    name="Authy Desktop"
    type="dmg"
-    downloadURL="https://electron.authy.com/download?channel=stable&arch=x64&platform=darwin&version=latest&product=authy"
+    downloadURL=$(curl -s -w '%{redirect_url}' -o /dev/null "https://electron.authy.com/download?channel=stable&arch=x64&platform=darwin&version=latest&product=authy" | sed 's/\ /%20/g')
    appNewVersion="$(curl -sfL --output /dev/null -r 0-0 "${downloadURL}" --remote-header-name --remote-name -w "%{url_effective}\n" | grep -o -E '([a-zA-Z0-9\_.%-]*)\.(dmg|pkg|zip|tbz)$' | sed -E 's/.*-([0-9.]*)\.dmg/\1/g')"
    expectedTeamID="9EVH78F4V4"
    ;;
--- a/fragments/labels/autopkgr.sh
+++ b/fragments/labels/autopkgr.sh
@@ -1,8 +1,6 @@
 autopkgr)
-    # credit: Søren Theilgaard (@theilgaard)
    name="AutoPkgr"
    type="dmg"
-    #downloadURL=$(curl -fs "https://api.github.com/repos/lindegroup/autopkgr/releases/latest" | awk -F '"' "/browser_download_url/ && /dmg/ && ! /sig/ && ! /CLI/ && ! /sha256/ { print \$4 }")
    downloadURL=$(downloadURLFromGit lindegroup autopkgr)
    appNewVersion=$(versionFromGit lindegroup autopkgr)
    expectedTeamID="JVY2ZR6SEF"
--- a/fragments/labels/boxdrive.sh
+++ b/fragments/labels/boxdrive.sh
@@ -1,12 +1,6 @@
 boxdrive)
-    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
    name="Box"
    type="pkg"
-    if [[ $(arch) == "arm64" ]]; then
-        #Note: https://support.box.com/hc/en-us/articles/1500004479962-Box-Drive-support-on-devices-with-M1-chips
-        downloadURL="https://e3.boxcdn.net/desktop/pre-releases/mac/BoxDrive.2.20.140-M1-beta.pkg"
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://e3.boxcdn.net/box-installers/desktop/releases/mac/Box.pkg"
-    fi
+    downloadURL="https://e3.boxcdn.net/box-installers/desktop/releases/mac/Box.pkg"
    expectedTeamID="M683GB7CPW"
    ;;
--- a/fragments/labels/brave.sh
+++ b/fragments/labels/brave.sh
@@ -1,15 +1,18 @@
 brave)
-    # credit: @securitygeneration
    name="Brave Browser"
    type="dmg"
    if [[ $(arch) != "i386" ]]; then
        printlog "Architecture: arm64 (not i386)"
-        downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osxarm64/release | grep -i "^location" | awk '{print $2}' | tr -d '\r\n')
+        downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osxarm64/release | grep -i "^location" | sed -E 's/.*(https.*\.dmg).*/\1/g')
+        appNewVersion="$(curl -fsL "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable-arm64/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@sparkle:version' 2>/dev/null  | cut -d '"' -f 2)"
+        #appNewVersion="96.$(curl -fsL "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable-arm64/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@sparkle:shortVersionString' 2>/dev/null  | cut -d '"' -f 2 | cut -d "." -f1-3)"
    else
        printlog "Architecture: i386"
-        downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osx/release | grep -i "^location" | awk '{print $2}' | tr -d '\r\n')
+        downloadURL=$(curl -fsIL https://laptop-updates.brave.com/latest/osx/release | grep -i "^location" | sed -E 's/.*(https.*\.dmg).*/\1/g')
+        appNewVersion="$(curl -fsL "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@sparkle:version' 2>/dev/null  | cut -d '"' -f 2)"
+        #appNewVersion="96.$(curl -fsL "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@sparkle:shortVersionString' 2>/dev/null  | cut -d '"' -f 2 | cut -d "." -f1-3)"
    fi
-#    downloadURL=$(curl --location --fail --silent "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
-    appNewVersion=$(curl --location --fail --silent "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@sparkle:shortVersionString' 2>/dev/null  | cut -d '"' -f 2)
+    versionKey="CFBundleVersion"
+#    downloadURL=$(curl -fsL "https://updates.bravesoftware.com/sparkle/Brave-Browser/stable/appcast.xml" | xpath '//rss/channel/item[last()]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
    expectedTeamID="KL8N8XSYF4"
    ;;
--- a/fragments/labels/canva.sh
+++ b/fragments/labels/canva.sh
@@ -2,10 +2,11 @@ canva)
    name="Canva"
    type="dmg"
    if [[ $(arch) == "arm64" ]]; then
-        downloadURL=$(curl -fsLI -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "accept-encoding: gzip, deflate, br" -H "accept-language: en-US,en;q=0.9" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "sec-fetch-mode: navigate" -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" "https://www.canva.com/download/mac/arm/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r')
+        downloadURL=https://desktop-release.canva.com/Canva-latest-arm64.dmg
+        appNewVersion=$( curl -fsLI -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "accept-encoding: gzip, deflate, br" -H "accept-language: en-US,en;q=0.9" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "sec-fetch-mode: navigate" -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" "https://www.canva.com/download/mac/arm/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-*.*\.dmg/\1/g' )
    elif [[ $(arch) == "i386" ]]; then
-        downloadURL=$(curl -fsLI -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" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "https://www.canva.com/download/mac/intel/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r')
+        downloadURL=https://desktop-release.canva.com/Canva-latest.dmg
+        appNewVersion=$( curl -fsLI -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" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "https://www.canva.com/download/mac/intel/canva-desktop/" | grep -i "^location" | cut -d " " -f2 | tr -d '\r' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-*.*\.dmg/\1/g' )
    fi
-    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
    expectedTeamID="5HD2ARTBFS"
    ;;
--- a/fragments/labels/code42.sh
+++ b/fragments/labels/code42.sh
@@ -1,8 +1,11 @@
 code42)
-    # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
    name="Code42"
    type="pkgInDmg"
-    downloadURL=https://download.code42.com/installs/agent/latest-mac.dmg
+    if [[ $(arch) == i386 ]]; then
+       downloadURL="https://download.code42.com/installs/agent/latest-mac.dmg"
+    elif [[ $(arch) == arm64 ]]; then
+       downloadURL="https://download.code42.com/installs/agent/latest-mac-arm64.dmg"
+    fi
    expectedTeamID="9YV9435DHD"
    blockingProcesses=( NONE )
    ;;
--- a/fragments/labels/daisydisk.sh
+++ b/fragments/labels/daisydisk.sh
@@ -0,0 +1,7 @@
+daisydisk)
+    name="DaisyDisk"
+    type="zip"
+    downloadURL="https://daisydiskapp.com/downloads/DaisyDisk.zip"
+    appNewVersion=$( curl -fs 'https://daisydiskapp.com/downloads/appcastReleaseNotes.php?appEdition=Standard' | grep Version | head -1 | sed -E 's/.*Version ([0-9.]*).*/\1/g' )
+    expectedTeamID="4CBU3JHV97"
+    ;;
--- a/fragments/labels/dangerzone.sh
+++ b/fragments/labels/dangerzone.sh
@@ -1,7 +1,7 @@
 dangerzone)
-    # credit: Micah Lee (@micahflee)
    name="Dangerzone"
    type="dmg"
-    downloadURL=$(curl -s https://dangerzone.rocks/ | grep https://github.com/firstlookmedia/dangerzone/releases/download | grep \.dmg | cut -d'"' -f2)
-    expectedTeamID="P24U45L8P5"
+    downloadURL="$(downloadURLFromGit firstlookmedia dangerzone)"
+    appNewVersion="$(versionFromGit firstlookmedia dangerzone)"
+    expectedTeamID="N9B95FDWH4"
    ;;
--- a/fragments/labels/depnotify.sh
+++ b/fragments/labels/depnotify.sh
@@ -1,7 +1,8 @@
 depnotify)
    name="DEPNotify"
-    type="zip"
-    downloadURL="https://files.nomad.menu/DEPNotify.zip"
+    type="pkg"
+    #packageID="menu.nomad.depnotify"
+    downloadURL="https://files.nomad.menu/DEPNotify.pkg"
+    #appNewVersion=$()
    expectedTeamID="VRPY9KHGX6"
-    targetDir="/Applications/Utilities"
    ;;
--- a/fragments/labels/diskspace.sh
+++ b/fragments/labels/diskspace.sh
@@ -0,0 +1,8 @@
+diskspace)
+    name="diskspace"
+    type="pkg"
+    packageID="com.scriptingosx.diskspace"
+    downloadURL="$(downloadURLFromGit scriptingosx diskspace)"
+    appNewVersion="$(versionFromGit scriptingosx diskspace)"
+    expectedTeamID="JME5BW3F3R"
+    ;;
--- a/fragments/labels/docker.sh
+++ b/fragments/labels/docker.sh
@@ -1,13 +1,12 @@
 docker)
-    # credit: @securitygeneration
    name="Docker"
    type="dmg"
-    #downloadURL="https://download.docker.com/mac/stable/Docker.dmg"
    if [[ $(arch) == arm64 ]]; then
     downloadURL="https://desktop.docker.com/mac/stable/arm64/Docker.dmg"
+     appNewVersion=$( curl -fs "https://desktop.docker.com/mac/main/arm64/appcast.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[last()]' 2>/dev/null | cut -d '"' -f2 )
    elif [[ $(arch) == i386 ]]; then
     downloadURL="https://desktop.docker.com/mac/stable/amd64/Docker.dmg"
+     appNewVersion=$( curl -fs "https://desktop.docker.com/mac/main/amd64/appcast.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[last()]' 2>/dev/null | cut -d '"' -f2 )
    fi
-    appNewVersion=$(curl -ifs https://docs.docker.com/docker-for-mac/release-notes/ | grep ">Docker Desktop Community" | head -1 | sed -n -e 's/^.*Community //p' | cut -d '<' -f1)
    expectedTeamID="9BNSXJN65R"
    ;;
--- a/fragments/labels/eshareosx.sh
+++ b/fragments/labels/eshareosx.sh
@@ -1,7 +1,7 @@
 eshareosx)
    name="e-Share"
    type="pkg"
-    packageID="com.ncryptedcloud.e-Share.pkg"
+    #packageID="com.ncryptedcloud.e-Share.pkg"
    downloadURL=https://www.ncryptedcloud.com/static/downloads/osx/$(curl -fs https://www.ncryptedcloud.com/static/downloads/osx/ | grep -o -i "href.*\".*\"" | cut -d '"' -f2)
    versionKey="CFBundleVersion"
    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z\-]*_([0-9.]*)\.pkg/\1/g' )
--- a/fragments/labels/evernote.sh
+++ b/fragments/labels/evernote.sh
@@ -1,7 +1,7 @@
 evernote)
    name="Evernote"
    type="dmg"
-    downloadURL=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://evernote.com/download" | grep -i ".dmg" | cut -d '"' -f2)
+    downloadURL=$(curl -fs -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" "https://evernote.com/download" | grep -i ".dmg" | grep -ioe "href.*" | cut -d '"' -f2)
    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
    expectedTeamID="Q79WDW8YH9"
    appName="Evernote.app"
--- a/fragments/labels/ferdi.sh
+++ b/fragments/labels/ferdi.sh
@@ -1,13 +1,12 @@
 ferdi)
    name="Ferdi"
    type="zip"
-    if [[ $(arch) == i386 ]]; then
-    downloadURL=$(curl --silent --fail "https://api.github.com/repos/getferdi/ferdi/releases/latest" \
-    | awk -F '"' "/browser_download_url/ && /mac.zip/ && ! /blockmap/ && ! /arm64-mac/ && ! /AppImage/{ print \$4 }")
-    elif [[ $(arch) == arm64 ]]; then
-    downloadURL=$(downloadURLFromGit getferdi ferdi )
-    archiveName="arm64-mac.zip"
-    fi    
+    if [[ $(arch) == "arm64" ]]; then
+        archiveName="arm64-mac.zip"
+    elif [[ $(arch) == "i386" ]]; then
+        archiveName="Ferdi-[0-9.]*-mac.zip"
+    fi
+    downloadURL="$(downloadURLFromGit getferdi ferdi)"
    appNewVersion=$(versionFromGit getferdi ferdi )
    expectedTeamID="B6J9X9DWFL"
    ;;
--- a/fragments/labels/flux.sh
+++ b/fragments/labels/flux.sh
@@ -0,0 +1,7 @@
+flux)
+    name="Flux"
+    type="zip"
+    downloadURL="https://justgetflux.com/mac/Flux.zip"
+    expectedTeamID="VZKSA7H9J9"
+    ;;
+    
--- a/fragments/labels/front.sh
+++ b/fragments/labels/front.sh
@@ -1,7 +1,13 @@
 front)
    name="Front"
    type="dmg"
-    downloadURL="https://dl.frontapp.com/macos/Front.dmg"
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL="https://dl.frontapp.com/macos/Front-arm64.dmg"
+        appNewVersion=$(curl -fs "https://dl.frontapp.com/desktop/updates/latest/mac-arm64/latest-mac.yml" | grep -i version | cut -d " " -f2)
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL="https://dl.frontapp.com/macos/Front.dmg"
+        appNewVersion=$(curl -fs "https://dl.frontapp.com/desktop/updates/latest/mac/latest-mac.yml" | grep -i version | cut -d " " -f2)
+    fi
    expectedTeamID="X549L7572J"
    Company="FrontApp. Inc."
    ;;
--- a/fragments/labels/golang.sh
+++ b/fragments/labels/golang.sh
@@ -1,10 +1,9 @@
 golang)
-    # credit: Søren Theilgaard (@theilgaard)
    name="GoLang"
    type="pkg"
    packageID="org.golang.go"
-    downloadURL="$(curl -fsIL "https://golang.org$(curl -fs "https://golang.org/dl/" | grep -i "downloadBox" | grep "pkg" | tr '"' '\n' | grep "pkg")" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n')"
-    appNewVersion="$( echo "${downloadURL}" | sed -E 's/.*\/(go[0-9.]*)\..*/\1/g' )" # Version includes letters "go"
+    downloadURL="https://go.dev$(curl -fs "https://go.dev/dl/" | grep -i "downloadBox" | grep "pkg" | tr '"' '\n' | grep "pkg")"
+    appNewVersion="$( echo "${downloadURL}" | sed -E 's/.*\/(go[0-9.]*)\..*/\1/g' )" # Version includes letters "go" in the beginning
    expectedTeamID="EQHXZ8M8AV"
    blockingProcesses=( NONE )
    ;;
--- a/fragments/labels/gpgsuite.sh
+++ b/fragments/labels/gpgsuite.sh
@@ -5,4 +5,5 @@ gpgsuite)
    pkgName="Install.pkg"
    downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4)
    expectedTeamID="PKV8ZPD836"
+    blockingProcesses=( "GPG Keychain" )
    ;;
--- a/fragments/labels/gpgsync.sh
+++ b/fragments/labels/gpgsync.sh
@@ -1,7 +1,8 @@
 gpgsync)
-    # credit: Micah Lee (@micahflee)
    name="GPG Sync"
    type="pkg"
-    downloadURL="https://github.com$(curl -s -L https://github.com/firstlookmedia/gpgsync/releases/latest | grep /firstlookmedia/gpgsync/releases/download | grep \.pkg | cut -d'"' -f2)"
+    packageID="org.firstlook.gpgsync"
+    downloadURL="$(downloadURLFromGit firstlookmedia gpgsync)"
+    appNewVersion="$(versionFromGit firstlookmedia gpgsync)"
    expectedTeamID="P24U45L8P5"
    ;;
--- a/fragments/labels/ibarcoder.sh
+++ b/fragments/labels/ibarcoder.sh
@@ -0,0 +1,7 @@
+ibarcoder)
+    name="iBarcoder"
+    type="dmg"
+    downloadURL="https://cristallight.com/Downloads/mac/ibarcoder.dmg"
+    appNewVersion="$(curl -fs "https://cristallight.com/iBarcoder/" | grep -i version: | head -1 | awk '{print $2}')"
+    expectedTeamID="JAXVB9AH9M"
+    ;;
--- a/fragments/labels/iina.sh
+++ b/fragments/labels/iina.sh
@@ -0,0 +1,7 @@
+iina)
+    name="IINA"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit iina iina )
+    appNewVersion=$(versionFromGit iina iina )
+    expectedTeamID="67CQ77V27R"
+    ;;
--- a/fragments/labels/itsycal.sh
+++ b/fragments/labels/itsycal.sh
@@ -0,0 +1,7 @@
+itsycal)
+    name="Itsycal"
+    type="zip"
+    downloadURL=$(curl -fs https://s3.amazonaws.com/itsycal/itsycal-apple-silicon.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | head -1 | cut -d '"' -f 2)
+    appNewVersion=$(curl -fs https://s3.amazonaws.com/itsycal/itsycal-apple-silicon.xml | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | head -1 | cut -d '"' -f 2)
+    expectedTeamID="HFT3T55WND"
+    ;;
--- a/fragments/labels/libreoffice.sh
+++ b/fragments/labels/libreoffice.sh
@@ -1,8 +1,12 @@
 libreoffice)
-    # credit: Micah Lee (@micahflee)
    name="LibreOffice"
    type="dmg"
-    downloadURL="https://download.documentfoundation.org/libreoffice/stable/$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)/mac/x86_64/LibreOffice_$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)_MacOS_x86-64.dmg"
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL="https://download.documentfoundation.org/libreoffice/stable/$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)/mac/aarch64/LibreOffice_$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)_MacOS_aarch64.dmg"
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL="https://download.documentfoundation.org/libreoffice/stable/$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)/mac/x86_64/LibreOffice_$(curl -s https://www.libreoffice.org/download/download/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)_MacOS_x86-64.dmg"
+    fi
    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)_.*/\1/g' )
    expectedTeamID="7P5S3ZLCN7"
+    blockingProcesses=( soffice )
    ;;
--- a/fragments/labels/logitechoptions.sh
+++ b/fragments/labels/logitechoptions.sh
@@ -1,9 +1,10 @@
 logitechoptions)
-    # credit: AP Orlebeke (@apizz)
    name="Logitech Options"
    type="pkgInZip"
-    downloadURL=$(curl -fs -L https://www.logitech.com/en-us/product/options | grep -m 1 -o "https.*zip" | sed 's/\"//' | awk '{print $1}')
-    #appNewVersion=$(curl -fs -L https://www.logitech.com/en-us/product/options | grep -m 1 -o "https.*zip" | sed 's/\"//' | awk '{print $1}' | sed -E 's/.*_([0-9\.]*)[-\.].*/\1/' )
-    pkgName="LogiMgr Installer ${appNewVersion}.app/Contents/Resources/LogiMgr.pkg"
+    #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"
+    appNewVersion=$(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 -B 5 -ie "https.*/.*/options/.*\.zip" | grep "Software Version" | sed 's/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]//g' | grep -ioe "Software Version.*[0-9.]*" | tr "/" "\n" | grep -oe "[0-9.]*" | head -1)
+    #pkgName="LogiMgr Installer "*".app/Contents/Resources/LogiMgr.pkg"
+    pkgName=LogiMgr.pkg
    expectedTeamID="QED4VVPZWA"
    ;;
--- a/fragments/labels/lowprofile.sh
+++ b/fragments/labels/lowprofile.sh
@@ -0,0 +1,7 @@
+lowprofile)
+    name="Low Profile"
+    type="dmg"
+    downloadURL="$(downloadURLFromGit ninxsoft LowProfile)"
+    appNewVersion="$(versionFromGit ninxsoft LowProfile)"
+    expectedTeamID="7K3HVCLV7Z"
+    ;;
--- a/fragments/labels/mattermost.sh
+++ b/fragments/labels/mattermost.sh
@@ -3,7 +3,7 @@ mattermost)
    type="dmg"
    archiveName="mac-universal.dmg"
    downloadURL=$(downloadURLFromGit mattermost desktop)
-    appNewVersion=$(versionFromGit mattermost desktop )
+    appNewVersion=$(versionFromGit mattermost desktop)
    expectedTeamID="UQ8HT4Q2XM"
-    Mattermost Helper (Renderer).app app.asar
+    blockingProcesses=( "Mattermost Helper.app" "Mattermost Helper (Renderer).app" "Mattermost Helper (GPU).app" "Mattermost Helper (Plugin).app" )
    ;;
--- a/fragments/labels/mobikinassistantforandroid.sh
+++ b/fragments/labels/mobikinassistantforandroid.sh
@@ -0,0 +1,8 @@
+mobikinassistantforandroid)
+    name="MobiKin Assistant for Android"
+    type="dmg"
+    downloadURL="https://www.mobikin.com/downloads/mobikin-android-assistant.dmg"
+    versionKey="CFBundleVersion"
+    appNewVersion=$(curl -fs https://www.mobikin.com/assistant-for-android-mac/ | grep -i "version:" | sed -E 's/.*Version: ([0-9.]*)<.*/\1/g')
+    expectedTeamID="YNL42PA5C4"
+    ;;
--- a/fragments/labels/mochakeyboard.sh
+++ b/fragments/labels/mochakeyboard.sh
@@ -0,0 +1,16 @@
+mochakeyboard)
+    name="Mocha Keyboard"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/mochakeyboard.dmg.zip"
+    curlOptions=( -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"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
--- a/fragments/labels/mochatelnet.sh
+++ b/fragments/labels/mochatelnet.sh
@@ -0,0 +1,16 @@
+mochatelnet)
+    name="Telnet"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/telnet.dmg.zip"
+    curlOptions=( -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"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
--- a/fragments/labels/mochatn3270.sh
+++ b/fragments/labels/mochatn3270.sh
@@ -0,0 +1,16 @@
+mochatn3270)
+    name="TN3270"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn3270.dmg.zip"
+    curlOptions=( -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"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
--- a/fragments/labels/mochatn3812.sh
+++ b/fragments/labels/mochatn3812.sh
@@ -0,0 +1,16 @@
+mochatn3812)
+    name="TN3812"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn3812.dmg.zip"
+    curlOptions=( -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"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="Frydendal"
+    ;;
--- a/fragments/labels/mochatn5250.sh
+++ b/fragments/labels/mochatn5250.sh
@@ -0,0 +1,16 @@
+mochatn5250)
+    name="TN5250"
+    type="appInDmgInZip"
+    downloadURL="https://mochasoft.dk/tn5250.dmg.zip"
+    curlOptions=( -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"
+-H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9"
+-H "accept-encoding: gzip, deflate, br"
+-H "accept-language: en-US,en;q=0.9"
+-H "sec-fetch-dest: document"
+-H "sec-fetch-mode: navigate"
+-H "sec-fetch-user: ?1"
+-H "sec-gpc: 1"
+-H "upgrade-insecure-requests: 1" )
+    appNewVersion=""
+    expectedTeamID="RR9F5EPNVW"
+    ;;
--- a/fragments/labels/ottomatic.sh
+++ b/fragments/labels/ottomatic.sh
@@ -5,4 +5,3 @@ ottomatic)
    appNewVersion=$(versionFromGit jorio OttoMatic)
    expectedTeamID="RVNL7XC27G"
    ;;
-
--- a/fragments/labels/paretosecurity.sh
+++ b/fragments/labels/paretosecurity.sh
@@ -0,0 +1,7 @@
+paretosecurity)
+    name="Pareto Security"
+    type="dmg"
+    downloadURL=$(downloadURLFromGit ParetoSecurity pareto-mac)
+    appNewVersion=$(versionFromGit ParetoSecurity pareto-mac)
+    expectedTeamID="PM784W7B8X"
+    ;;
--- a/fragments/labels/pritunl.sh
+++ b/fragments/labels/pritunl.sh
@@ -0,0 +1,13 @@
+pritunl)
+    name="Pritunl"
+    type="pkgInZip"
+    packageID="com.pritunl.pkg.Pritunl"
+    if [[ $(arch) == "arm64" ]]; then
+        archiveName="Pritunl.arm64.pkg.zip"
+    elif [[ $(arch) == "i386" ]]; then
+        archiveName="Pritunl.pkg.zip"
+    fi
+    downloadURL=$(downloadURLFromGit pritunl pritunl-client-electron)
+    appNewVersion=$(versionFromGit pritunl pritunl-client-electron)
+    expectedTeamID="U22BLATN63"
+    ;;
--- a/fragments/labels/promiseutilityr.sh
+++ b/fragments/labels/promiseutilityr.sh
@@ -1,3 +1,4 @@
+promiseutility|\
 promiseutilityr)
    name="Promise Utility"
    type="pkgInDmg"
--- a/fragments/labels/protonvpn.sh
+++ b/fragments/labels/protonvpn.sh
@@ -0,0 +1,7 @@
+protonvpn)
+    name="ProtonVPN"
+    type="dmg"
+    downloadURL=$(curl -fs "https://protonvpn.com/download" | grep -Eo "(http|https)://[a-zA-Z0-9./?=_%:-]*\.dmg" | head -1)
+    appNewVersion=$(echo $downloadURL | sed -e 's/^.*\/Proton.*_v\([0-9.]*\)\.dmg/\1/g')
+    expectedTeamID="J6S6Q257EK"
+    ;;
--- a/fragments/labels/proxyman.sh
+++ b/fragments/labels/proxyman.sh
@@ -1,7 +1,8 @@
 proxyman)
-	name="Proxyman"
-	type="dmg"
-	downloadURL="https://proxyman.io/release/osx/Proxyman_latest.dmg"
-	expectedTeamID="3X57WP8E8V"
-	appNewVersion=$(curl -s -L https://github.com/ProxymanApp/Proxyman | grep -o 'releases/tag/.*\>' | awk -F '/' '{print $3}')
-	;;
+    name="Proxyman"
+    type="dmg"
+    #downloadURL="https://proxyman.io/release/osx/Proxyman_latest.dmg"
+    downloadURL="$(downloadURLFromGit ProxymanApp Proxyman)"
+    appNewVersion="$(versionFromGit ProxymanApp Proxyman)"
+    expectedTeamID="3X57WP8E8V"
+    ;;
--- a/fragments/labels/rancherdesktop.sh
+++ b/fragments/labels/rancherdesktop.sh
@@ -0,0 +1,9 @@
+rancherdesktop)
+    name="Rancher.Desktop-1.0.0-mac"
+    type="zip"
+    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
@@ -0,0 +1,7 @@
+remotedesktopmanagerenterprise)
+    name="Remote Desktop Manager"
+    type="dmg"
+    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"
+    ;;
--- a/fragments/labels/remotedesktopmanagerfree.sh
+++ b/fragments/labels/remotedesktopmanagerfree.sh
@@ -0,0 +1,7 @@
+remotedesktopmanagerfree)
+    name="Remote Desktop Manager Free"
+    type="dmg"
+    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/sdnotary.sh
+++ b/fragments/labels/sdnotary.sh
@@ -0,0 +1,7 @@
+sdnotary)
+    name="SD Notary"
+    type="zip"
+    downloadURL=$(curl -fs https://latenightsw.com/sd-notary-notarizing-made-easy/ | grep -io "https://.*/.*\.zip")
+    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\/[a-zA-Z]*([0-9.]*)-.*\.zip/\1/g')
+    expectedTeamID="Z7S6X96M3X"
+    ;;
--- a/fragments/labels/secretive.sh
+++ b/fragments/labels/secretive.sh
@@ -0,0 +1,8 @@
+secretive)
+    name="Secretive"
+    type="zip"
+    downloadURL=$(downloadURLFromGit maxgoedjen secretive)
+    appNewVersion=$(versionFromGit maxgoedjen secretive)
+    expectedTeamID="Z72PRUAWF6"
+    ;;
+    
--- a/fragments/labels/signal.sh
+++ b/fragments/labels/signal.sh
@@ -1,8 +1,7 @@
 signal)
-    # credit: Søren Theilgaard (@theilgaard)
    name="Signal"
    type="dmg"
-    downloadURL=https://updates.signal.org/desktop/$(curl -fs https://updates.signal.org/desktop/latest-mac.yml | awk '/url/ && /dmg/ {print $3}')
+    downloadURL=https://updates.signal.org/desktop/$(curl -fs https://updates.signal.org/desktop/latest-mac.yml | awk '/url/ && /dmg/ {print $3}' | grep -i universal)
    appNewVersion=$(curl -fs https://updates.signal.org/desktop/latest-mac.yml | grep version | awk '{print $2}')
    expectedTeamID="U68MSDN6DR"
    ;;
--- a/fragments/labels/tableaupublic.sh
+++ b/fragments/labels/tableaupublic.sh
@@ -0,0 +1,8 @@
+tableaupublic)
+    name="Tableau Public"
+    type="pkgInDmg"
+    packageID="com.tableausoftware.tableaudesktop"
+    downloadURL=$(curl -fs https://www.tableau.com/downloads/public/mac | awk '/TableauPublic/' | xmllint --recover --html --xpath "//a/text()" -)
+    appNewVersion=$( echo $downloadURL | sed -E 's/.*TableauPublic-([-0-9]*)\.dmg/\1/g' | tr "-" "." )
+    expectedTeamID="QJ4XPRK37C"
+    ;;
--- a/fragments/labels/tageditor.sh
+++ b/fragments/labels/tageditor.sh
@@ -2,6 +2,6 @@ tageditor)
     name="Tag Editor"
     type="dmg"
     downloadURL="https://amvidia.com/downloads/tag-editor-mac.dmg"
-     appNewVersion=curl -sf "https://amvidia.com/tag-editor" | grep -o -E '"softwareVersion":.'"{8}" | sed 's/\"//g' | awk -F ': ' '{print $2}'
+     appNewVersion=$(curl -sf "https://amvidia.com/tag-editor" | grep -o -E '"softwareVersion":.'"{8}" | sed -E 's/.*"([0-9.]*).*/\1/g')
     expectedTeamID="F2TH9XX9CJ"
     ;;
--- a/fragments/labels/textexpander.sh
+++ b/fragments/labels/textexpander.sh
@@ -1,7 +1,7 @@
 textexpander)
    name="TextExpander"
-    type="zip"
-    downloadURL="https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx"
-    appNewVersion=$( curl -fsIL "https://textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" | grep -i "^location" | awk '{print $2}' | tail -1 | cut -d "_" -f2 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p' )
+    type="dmg"
+    downloadURL="https://cgi.textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx"
+    appNewVersion=$( curl -fsIL "https://cgi.textexpander.com/cgi-bin/redirect.pl?cmd=download&platform=osx" | grep -i "^location" | awk '{print $2}' | tail -1 | cut -d "_" -f2 | sed -nre 's/^[^0-9]*(([0-9]+\.)*[0-9]+).*/\1/p' )
    expectedTeamID="7PKJ6G4DXL"
    ;;
--- a/fragments/labels/tidal.sh
+++ b/fragments/labels/tidal.sh
@@ -0,0 +1,7 @@
+tidal)
+    name="TIDAL"
+    type="dmg"
+    downloadURL="https://download.tidal.com/desktop/TIDAL.dmg"
+    appNewVersion=$(curl -fs https://update.tidal.com/updates/latest\?v\=1 | cut -d '"' -f4 | sed -E 's/https.*\/TIDAL\.([0-9.]*)\.zip/\1/g')
+    expectedTeamID="GK2243L7KB"
+    ;;
--- a/fragments/labels/tom4aconverter.sh
+++ b/fragments/labels/tom4aconverter.sh
@@ -2,6 +2,6 @@ tom4aconverter)
     name="To M4A Converter"
     type="dmg"
     downloadURL="https://amvidia.com/downloads/to-m4a-converter-mac.dmg"
-     appNewVersion=curl -sf "https://amvidia.com/to-m4a-converter" | grep -o -E '"softwareVersion":.'"{8}" | sed 's/\"//g' | awk -F ': ' '{print $2}'
+     appNewVersion=$(curl -sf "https://amvidia.com/to-m4a-converter" | grep -o -E '"softwareVersion":.'"{8}" | sed 's/\"//g' | awk -F ': ' '{print $2}')
     expectedTeamID="F2TH9XX9CJ"
     ;;
--- a/fragments/labels/vimac.sh
+++ b/fragments/labels/vimac.sh
@@ -0,0 +1,7 @@
+vimac)
+    name="Vimac"
+    type="zip"
+    downloadURL=$(curl -fs "https://vimacapp.com/latest-release-metadata" | tr ',' '\n' | awk -F\" '/download_url/ {print $4}')
+    appNewVersion=$(curl -fs "https://vimacapp.com/latest-release-metadata" | tr ',' '\n' | awk -F\" '/short_version/ {print $4}')
+    expectedTeamID="LQ2VH8VB84"
+    ;;
--- a/fragments/labels/wacomdrivers.sh
+++ b/fragments/labels/wacomdrivers.sh
@@ -1,8 +1,8 @@
 wacomdrivers)
    name="Wacom Desktop Center"
    type="pkgInDmg"
-    downloadURL="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep -e "drivers/mac/professional.*dmg" | head -1 | sed -e 's/data-download-link="//g' -e 's/"//' | awk '{$1=$1}{ print }' | sed 's/\r//')"
+    downloadURL="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep -e "drivers/mac/professional.*dmg" | head -1 | tr '"' "\n" | grep -i http)"
    expectedTeamID="EG27766DY7"
-    pkgName="Install Wacom Tablet.pkg"
-    appNewVersion="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep mac/professional/releasenotes | head -1 | awk -F"|" '{print $1}' | awk -F"Driver" '{print $3}' | sed -e 's/ (.*//g' | tr -d ' ')"
+    #pkgName="Install Wacom Tablet.pkg"
+    appNewVersion="$(curl -fs https://www.wacom.com/en-us/support/product-support/drivers | grep mac/professional/releasenotes | head -1 | tr '"' "\n" | grep -e "Driver [0-9][-0-9.]*" | sed -E 's/Driver ([-0-9.]*).*/\1/g')"
    ;;
--- a/fragments/labels/wallyezflash.sh
+++ b/fragments/labels/wallyezflash.sh
@@ -2,6 +2,7 @@ wallyezflash)
    name="Wally"
    type="dmg"
    downloadURL="https://configure.zsa.io/wally/osx"
+    # 2022-02-07: Info.plist is totally wrong defined and contains no version information
    #appNewVersion=$(curl -fsIL "${downloadURL}" | grep -i ^location | head -1 | sed -E 's/.*\/[a-zA-Z\-]*-([0-9.]*)\..*/\1/g')
    expectedTeamID="V32BWKSNYH"
    #versionKey="CFBundleVersion"
--- a/fragments/labels/wireshark.sh
+++ b/fragments/labels/wireshark.sh
@@ -1,8 +1,11 @@
 wireshark)
-    # credit: Oh4sh0 https://github.com/Oh4sh0
    name="Wireshark"
    type="dmg"
-    downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg"
-    appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep "Stable Release" | grep -o "(.*.)" | cut -f2 | head -1 | awk -F '[()]' '{print $2}')
+    if [[ $(arch) == i386 ]]; then
+      downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Intel%2064.dmg"
+    elif [[ $(arch) == arm64 ]]; then
+      downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Arm%2064.dmg"
+    fi
+    appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep -i "href.*_stable" | sed -E 's/.*\(([0-9.]*)\).*/\1/g')
    expectedTeamID="7Z6EMTD2C6"
    ;;
--- a/fragments/labels/zulujdk11.sh
+++ b/fragments/labels/zulujdk11.sh
@@ -3,9 +3,9 @@ zulujdk11)
    type="pkgInDmg"
    packageID="com.azulsystems.zulu.11"
    if [[ $(arch) == i386 ]]; then
-      downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu11.*ca-jdk11.*x64.dmg" | sed 's/\\//g')
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu11.*ca-jdk11.*x64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
    elif [[ $(arch) == arm64 ]]; then
-      downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu11.*ca-jdk11.*aarch64.dmg" | sed 's/\\//g')
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu11.*ca-jdk11.*aarch64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
    fi
    expectedTeamID="TDTHCUPYFR"
    appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
--- a/fragments/labels/zulujdk13.sh
+++ b/fragments/labels/zulujdk13.sh
@@ -3,9 +3,9 @@ zulujdk13)
    type="pkgInDmg"
    packageID="com.azulsystems.zulu.13"
    if [[ $(arch) == i386 ]]; then
-        downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu13.*ca-jdk13.*x64.dmg" | sed 's/\\//g')
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu13.*ca-jdk13.*x64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
    elif [[ $(arch) == arm64 ]]; then
-        downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu13.*ca-jdk13.*aarch64.dmg" | sed 's/\\//g')
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu13.*ca-jdk13.*aarch64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
    fi
    expectedTeamID="TDTHCUPYFR"
    appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
--- a/fragments/labels/zulujdk15.sh
+++ b/fragments/labels/zulujdk15.sh
@@ -3,9 +3,9 @@ zulujdk15)
    type="pkgInDmg"
    packageID="com.azulsystems.zulu.15"
    if [[ $(arch) == i386 ]]; then
-        downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu15.*ca-jdk15.*x64.dmg" | sed 's/\\//g')
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu15.*ca-jdk15.*x64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
    elif [[ $(arch) == arm64 ]]; then
-        downloadURL=$(curl -fs "https://www.azul.com/downloads/zulu-community/" | xmllint --html --format - 2>/dev/null | tr , '\n' | grep -o "https:.*/zulu15.*ca-jdk15.*aarch64.dmg" | sed 's/\\//g')
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu15.*ca-jdk15.*aarch64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
    fi
    expectedTeamID="TDTHCUPYFR"
    appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
--- a/fragments/labels/zulujdk17.sh
+++ b/fragments/labels/zulujdk17.sh
@@ -0,0 +1,13 @@
+zulujdk17)
+    name="Zulu JDK 17"
+    type="pkgInDmg"
+    packageID="com.azulsystems.zulu.17"
+    if [[ $(arch) == i386 ]]; then
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu17.*ca-jdk17.*x64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
+    elif [[ $(arch) == arm64 ]]; then
+        downloadURL=https://cdn.azul.com/zulu/bin/$(curl -fs "https://cdn.azul.com/zulu/bin/" | grep -Eio '">zulu17.*ca-jdk17.*aarch64.dmg(.*)' | cut -c3- | sed 's/<\/a>//' | sed -E 's/([0-9.]*)M//' | awk '{print $2 $1}' | sort | cut -c11- | tail -1)
+    fi
+    expectedTeamID="TDTHCUPYFR"
+    appCustomVersion(){ java -version 2>&1 | grep Runtime | awk '{print $4}' | sed -e "s/.*Zulu//" | cut -d '-' -f 1 | sed -e "s/+/\./" }
+    appNewVersion=$(echo "$downloadURL" | cut -d "-" -f 1 | sed -e "s/.*zulu//") # Cannot be compared to anything
+    ;;
--- a/fragments/main.sh
+++ b/fragments/main.sh
@@ -1,3 +1,4 @@
+# Mark: 4 Main
 *)
    # unknown label
    #printlog "unknown label $label"
@@ -5,11 +6,26 @@
    ;;
 esac

+# Are we only asked to return label name
+if [[ $RETURN_LABEL_NAME -eq 1 ]]; then
+    printlog "Only returning label name."
+    printlog "$name"
+    echo "$name"
+    exit
+fi

 # MARK: application download and installation starts here

+if [[ ${INTERRUPT_DND} = "no" ]]; then
+    # Check if a fullscreen app is active
+    if hasDisplaySleepAssertion; then
+        cleanupAndExit 1 "active display sleep assertion detected, aborting"
+    fi
+fi
+
 printlog "BLOCKING_PROCESS_ACTION=${BLOCKING_PROCESS_ACTION}"
 printlog "NOTIFY=${NOTIFY}"
+printlog "LOGGING=${LOGGING}"

 # Finding LOGO to use in dialogs
 case $LOGO in
@@ -28,14 +44,17 @@ case $LOGO in
    mosyleb)
        # Mosyle Business
        LOGO="/Applications/Self-Service.app/Contents/Resources/AppIcon.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="Mosyle Corporation MDM"; fi
        ;;
    mosylem)
        # Mosyle Manager (education)
        LOGO="/Applications/Manager.app/Contents/Resources/AppIcon.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="Mosyle Corporation MDM"; fi
        ;;
    addigy)
        # Addigy
        LOGO="/Library/Addigy/macmanage/MacManage.app/Contents/Resources/atom.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="MDM Profile"; fi
        ;;
 esac
 if [[ ! -a "${LOGO}" ]]; then
@@ -47,6 +66,8 @@ if [[ ! -a "${LOGO}" ]]; then
 fi
 printlog "LOGO=${LOGO}"

+printlog "Label type: $type"
+
 # MARK: extract info from data
 if [ -z "$archiveName" ]; then
    case $type in
@@ -67,6 +88,7 @@ if [ -z "$archiveName" ]; then
            ;;
    esac
 fi
+printlog "archiveName: $archiveName" DEBUG

 if [ -z "$appName" ]; then
    # when not given derive from name
@@ -96,7 +118,7 @@ if [[ -z $blockingProcesses ]]; then
 fi

 # MARK: determine tmp dir
-if [ "$DEBUG" -ne 0 ]; then
+if [ "$DEBUG" -eq 1 ]; then
    # for debugging use script dir as working directory
    tmpDir=$(dirname "$0")
 else
@@ -105,7 +127,7 @@ else
 fi

 # MARK: change directory to temporary working directory
-printlog "Changing directory to $tmpDir"
+printlog "Changing directory to $tmpDir" DEBUG
 if ! cd "$tmpDir"; then
    printlog "error changing directory $tmpDir"
    cleanupAndExit 1
@@ -116,15 +138,14 @@ getAppVersion
 printlog "appversion: $appversion"

 # MARK: Exit if new version is the same as installed version (appNewVersion specified)
-# credit: Søren Theilgaard (@theilgaard)
-if [[ $INSTALL == "force" ]]; then
-    printlog "Using force to install, so not using updateTool."
+if [[ "$type" != "updateronly" && ($INSTALL == "force" || $IGNORE_APP_STORE_APPS == "yes") ]]; then
+    printlog "Label is not of type “updateronly”, and it’s set to use force to install or ignoring app store apps, so not using updateTool."
    updateTool=""
 fi
 if [[ -n $appNewVersion ]]; then
    printlog "Latest version of $name is $appNewVersion"
    if [[ $appversion == $appNewVersion ]]; then
-        if [[ $DEBUG -eq 0 ]]; then
+        if [[ $DEBUG -ne 1 ]]; then
            printlog "There is no newer version available."
            if [[ $INSTALL != "force" ]]; then
                message="$name, version $appNewVersion, is  the latest version."
@@ -135,7 +156,7 @@ if [[ -n $appNewVersion ]]; then
                cleanupAndExit 0 "No newer version."
            fi
        else
-            printlog "DEBUG mode enabled, not exiting, but there is no new version of app."
+            printlog "DEBUG mode 1 enabled, not exiting, but there is no new version of app."
        fi
    fi
 else
@@ -145,7 +166,7 @@ fi
 # MARK: check if this is an Update and we can use updateTool
 if [[ (-n $appversion && -n "$updateTool") || "$type" == "updateronly" ]]; then
    printlog "appversion & updateTool"
-    if [[ $DEBUG -eq 0 ]]; then
+    if [[ $DEBUG -ne 1 ]]; then
        if runUpdateTool; then
            finishing
            cleanupAndExit 0
@@ -154,16 +175,16 @@ if [[ (-n $appversion && -n "$updateTool") || "$type" == "updateronly" ]]; then
            cleanupAndExit 0
        fi # otherwise continue
    else
-        printlog "DEBUG mode enabled, not running update tool"
+        printlog "DEBUG mode 1 enabled, not running update tool"
    fi
 fi

 # MARK: download the archive
-if [ -f "$archiveName" ] && [ "$DEBUG" -ne 0 ]; then
-    printlog "$archiveName exists and DEBUG enabled, skipping download"
+if [ -f "$archiveName" ] && [ "$DEBUG" -eq 1 ]; then
+    printlog "$archiveName exists and DEBUG mode 1 enabled, skipping download"
 else
-    # download the dmg
-    printlog "Downloading $downloadURL to $archiveName"
+    # download
+    printlog "Downloading $downloadURL to $archiveName" REQ
    if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
        printlog "notifying"
        if [[ $updateDetected == "YES" ]]; then
@@ -172,19 +193,28 @@ else
            displaynotification "Downloading new $name" "Download in progress …"
        fi
    fi
-    if ! curl --location --fail --silent "$downloadURL" -o "$archiveName"; then
+    curlDownload=$(curl -v -fsL --show-error ${curlOptions} "$downloadURL" -o "$archiveName" 2>&1)
+    curlDownloadStatus=$(echo $?)
+    deduplicatelogs "$curlDownload"
+    if [[ $curlDownloadStatus -ne 0 ]]; then
+    #if ! curl --location --fail --silent "$downloadURL" -o "$archiveName"; then
        printlog "error downloading $downloadURL"
        message="$name update/installation failed. This will be logged, so IT can follow up."
        if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
            printlog "notifying"
            if [[ $updateDetected == "YES" ]]; then
-                displaynotification "$message" "Error updating $name"
+                displaynotification "$message" "Error updating $name" ERROR
            else
-                displaynotification "$message" "Error installing $name"
+                displaynotification "$message" "Error installing $name" ERROR
            fi
        fi
-        cleanupAndExit 2
+        printlog "File list: $(ls -lh "$archiveName")" ERROR
+        printlog "File type: $(file "$archiveName")" ERROR
+        cleanupAndExit 2 "Error downloading $downloadURL error:\n$logoutput" ERROR
    fi
+    printlog "File list: $(ls -lh "$archiveName")" DEBUG
+    printlog "File type: $(file "$archiveName")" DEBUG
+    printlog "curl output was:\n$logoutput" DEBUG
 fi

 # MARK: when user is logged in, and app is running, prompt user to quit app
@@ -201,7 +231,7 @@ else
 fi

 # MARK: install the download
-printlog "Installing $name"
+printlog "Installing $name" REQ
 if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
    printlog "notifying"
    if [[ $updateDetected == "YES" ]]; then
@@ -213,7 +243,7 @@ fi

 if [ -n "$installerTool" ]; then
    # installerTool defined, and we use that for installation
-    printlog "installerTool used: $installerTool"
+    printlog "installerTool used: $installerTool" REQ
    appName="$installerTool"
 fi

--- a/fragments/version.sh
+++ b/fragments/version.sh
@@ -1 +1 @@
-8.0
+9.1beta
--- a/utils/assemble.sh
+++ b/utils/assemble.sh
@@ -9,8 +9,6 @@ install_location="/usr/local/Installomator/"
 signature="Developer ID Installer: Armin Briegel (JME5BW3F3R)"

 # notarization
-dev_team="JME5BW3F3R" # asc-provider
-dev_account="developer@scriptingosx.com"
 dev_keychain_label="notary-scriptingosx"

 # parse arguments
--- a/utils/buildLabel.sh
+++ b/utils/buildLabel.sh
@@ -82,6 +82,43 @@ pkgInvestigation() {
    echo "$packageID"
    echo "Above is the possible packageIDs that can be used, and the correct one is probably one of those with a version number. More investigation might be needed to figure out correct packageID if several are displayed."
 }
+
+dmgInvestigation() {
+    echo "DMG investigation."
+    # mount the dmg
+    echo "Mounting $archiveName"
+    if ! dmgmount=$(echo "Y"$'\n' | hdiutil attach "$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
+        echo "Error mounting $archiveName"
+        exit 3
+    fi
+    echo "Mounted: $dmgmount"
+    
+    # check if app og pkg exists on disk image
+    appPath=$(find "$dmgmount" -name "*.app" -maxdepth 1 -print )
+    pkgPath=$(find "$dmgmount" -name "*.pkg" -maxdepth 1 -print )
+    
+    if [[ $appPath != "" ]]; then
+        echo "App found: $appPath"
+        if [[ $archiveExt = "dmgInZip" ]]; then
+            archiveExt="appInDmgInZip"
+        fi
+        appInvestigation
+    elif [[ $pkgPath != "" ]]; then
+        echo "PKG found: $pkgPath"
+        if [[ $archiveExt = "dmgInZip" ]]; then
+            archiveExt="pkgInDmgInZip not supported, yet!"
+        else
+            archiveExt="pkgInDmg"
+        fi
+        pkgInvestigation
+    else
+        echo "Nothing found on DMG."
+        exit 9
+    fi
+    
+    hdiutil detach "$dmgmount"
+}
+
 appInvestigation() {
    appName=${appPath##*/}
    name=${appName%.*}
@@ -116,29 +153,105 @@ echo "Downloading $downloadURL"
 echo $(basename $downloadURL)
 # First trying to find redirection headers on the download, as those can contain version numbers
 echo "Redirecting to (maybe this can help us with version):\n$(curl -fsIL -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" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "$downloadURL" | grep -i "^[location|x\-amz\-meta\-version]*")"
-# Now downloading without extra headers
-if ! downloadOut="$(curl -fL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
-    echo "error downloading $downloadURL using standard headers."
-    echo "result: $downloadOut"
-    echo "Trying all headers…" # that I know of
-    if ! downloadOut="$(curl -fL -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" -H "accept-encoding: gzip, deflate, br" -H "Referrer Policy: strict-origin-when-cross-origin" -H "upgrade-insecure-requests: 1" -H "sec-fetch-dest: document" -H "sec-gpc: 1" -H "sec-fetch-user: ?1" -H "accept-language: en-US,en;q=0.9" -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" -H "sec-fetch-mode: navigate" "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
-        # we are only here if the download failed
-        echo "error downloading $downloadURL using all headers."
-        echo "result: $downloadOut"
-        # Sometimes a server will give some results to the downloaded output
-        if [[ -n $downloadOut ]]; then
-            echo "Trying output of this…"
-            downloadURL="$(echo $downloadOut | tail -1)"
-            # Last chance for succes on this download
-            if ! downloadOut="$(curl -fL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
-                echo "error downloading $downloadURL using previous output."
-                echo "result: $downloadOut"
-                echo "No more tries. Cannot continue."
-                exit 1
+# Now downloading without various sets of extra headers
+if ! downloadOut1="$( \
+curl -fL "$downloadURL" --remote-header-name --remote-name \
+-w "%{filename_effective}\n%{url_effective}\n")"
+then
+    echo "error downloading $downloadURL with no headers."
+    echo "result: $downloadOut1"
+    echo "Trying 1st set of extra headers to download."
+    if ! downloadOut2="$( \
+    curl -fL \
+    -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" \
+    -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" \
+    -H "accept-encoding: gzip, deflate, br" \
+    -H "accept-language: en-US,en;q=0.9" \
+    -H "sec-fetch-dest: document" \
+    -H "sec-fetch-mode: navigate" \
+    -H "sec-fetch-user: ?1" \
+    -H "sec-gpc: 1" \
+    -H "upgrade-insecure-requests: 1" \
+    "$downloadURL" --remote-header-name --remote-name \
+    -w "%{filename_effective}\n%{url_effective}\n")"
+    then
+        echo "error downloading $downloadURL with 1st set of headers."
+        echo "result: $downloadOut2"
+        echo "Trying 2nd set of extra headers to download."
+        if ! downloadOut3="$( \
+        curl -fL \
+        -H "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/97.0.4692.71 Safari/537.36" \
+        -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" \
+        -H "accept-encoding: gzip, deflate, br" \
+        -H "accept-language: en-US,en;q=0.9" \
+        -H "sec-fetch-dest: document" \
+        -H "sec-fetch-mode: navigate" \
+        -H "sec-fetch-site: same-site" \
+        -H "sec-fetch-user: ?1" \
+        -H "sec-gpc: 1" \
+        -H "upgrade-insecure-requests: 1" \
+        "$downloadURL" --remote-header-name --remote-name \
+        -w "%{filename_effective}\n%{url_effective}\n")"
+        then
+            echo "error downloading $downloadURL with 2nd set of headers."
+            echo "result: $downloadOut3"
+            echo "Trying 3rd set of extra headers to download."
+            if ! downloadOut4="$( \
+            curl -fL \
+            -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" \
+            -H "accept: text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9" \
+            -H "accept-encoding: gzip, deflate, br" \
+            -H "accept-language: en-US,en;q=0.9" \
+            -H "sec-fetch-dest: document" \
+            -H "sec-fetch-mode: navigate" \
+            -H "sec-fetch-user: ?1" \
+            -H "sec-gpc: 1" \
+            -H "upgrade-insecure-requests: 1" \
+            -H "Referrer Policy: strict-origin-when-cross-origin" \
+            "$downloadURL" --remote-header-name --remote-name \
+            -w "%{filename_effective}\n%{url_effective}\n")"
+            then
+                # we are only here if the download failed
+                echo "error downloading $downloadURL with 3rd set of headers."
+                echo "result: $downloadOut4"
+                echo "no more header sets to try"
+                # Sometimes a server will give some results to the downloaded output
+                echo "If any information came out of the previous download attempts, we can try those…"
+                downloadOuts=( "$downloadOut1" "$downloadOut3" "$downloadOut3" "$downloadOut4" )
+                downloadOutCount=${#downloadOuts}
+                for downloadOut in $downloadOuts ; do
+                    if [[ -n $downloadOut ]]; then
+                        echo "Trying output of this…"
+                        downloadURL="$(echo $downloadOut | tail -1)"
+                        # Last chance for succes on this download
+                        if ! downloadOut="$(curl -fL "$downloadURL" --remote-header-name --remote-name -w "%{filename_effective}\n%{url_effective}\n")"; then
+                            echo "error downloading $downloadURL using previous output."
+                            echo "result: $downloadOut"
+                            ((downloadOutCount--))
+                        else
+                            echo "Success on this download."
+                            succesDownloadOut=$downloadOut
+                            break 2
+                        fi
+                    fi
+                done
+                if [[ $downloadOutCount -eq 0 ]]; then
+                    echo "No more tries. Cannot continue."
+                    exit 1
+                fi
+            else
+                succesDownloadOut=$downloadOut4
            fi
+        else
+            succesDownloadOut=$downloadOut3
        fi
+    else
+        succesDownloadOut=$downloadOut2
    fi
+else
+    succesDownloadOut=$downloadOut1
 fi
+downloadOut=$succesDownloadOut

 # Now we have downloaded the archive, and we need to analyze this
 # The download have returned both {filename_effective} and {url_effective}
@@ -152,7 +265,7 @@ echo "archivePath: $archivePath"
 # So we want to investigate which one has the filename
 try1archiveName=${${archiveTempName##*/}%%\?*}
 try2archiveName=${${archivePath##*/}%%\?*}
-fileName_re='^([a-zA-Z0-9\_.%-]*)\.(dmg|pkg|zip|tbz)$' # regular expression for matching
+fileName_re='^([a-zA-Z0-9\_.%-]*)\.(dmg|pkg|zip|tbz|gz)$' # regular expression for matching
 if [[ "${try1archiveName}" =~ $fileName_re ]]; then
    archiveName=${try1archiveName}
 elif [[ "${try2archiveName}" =~ $fileName_re ]]; then
@@ -171,10 +284,6 @@ echo "name: $name"
 archiveExt=${archiveName##*.}
 type=$archiveExt
 echo "archiveExt: $archiveExt"
-identifier=${name:l} # making lower case
-identifier=${identifier//\%[0-9a-fA-F][0-9a-fA-F]} # removing certain characters
-identifier=${identifier//[,._*@$\(\)\-]} # removing more characters from label name
-echo "identifier: $identifier"

 # Now figuring out the filename extension and handling those situations
 if [ "$archiveExt" = "pkg" ]; then
@@ -183,31 +292,7 @@ if [ "$archiveExt" = "pkg" ]; then
    pkgInvestigation
 elif [ "$archiveExt" = "dmg" ]; then
    echo "Diskimage found"
-    # mount the dmg
-    echo "Mounting $archiveName"
-    if ! dmgmount=$(echo "Y"$'\n' | hdiutil attach "$archiveName" -nobrowse -readonly | tail -n 1 | cut -c 54- ); then
-        echo "Error mounting $archiveName"
-        exit 3
-    fi
-    echo "Mounted: $dmgmount"
-    
-    # check if app og pkg exists on disk image
-    appPath=$(find "$dmgmount" -name "*.app" -maxdepth 1 -print )
-    pkgPath=$(find "$dmgmount" -name "*.pkg" -maxdepth 1 -print )
-    
-    if [[ $appPath != "" ]]; then
-        echo "App found: $appPath"
-        appInvestigation
-    elif [[ $pkgPath != "" ]]; then
-        echo "PKG found: $pkgPath"
-        archiveExt="pkgInDmg"
-        pkgInvestigation
-    else
-        echo "Nothing found on DMG."
-        exit 9
-    fi
-    
-    hdiutil detach "$dmgmount"
+    dmgInvestigation
 elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ]; then
    echo "Compressed file found"
    # unzip the archive
@@ -216,6 +301,7 @@ elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ]; then
    # check if app og pkg exists after expanding
    appPath=$(find "$tmpDir" -name "*.app" -maxdepth 2 -print )
    pkgPath=$(find "$tmpDir" -name "*.pkg" -maxdepth 2 -print )
+    archiveName=$(find "$tmpDir" -name "*.dmg" -maxdepth 2 -print )
    
    if [[ $appPath != "" ]]; then
        echo "App found: $appPath"
@@ -223,14 +309,24 @@ elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ]; then
    elif [[ $pkgPath != "" ]]; then
        echo "PKG found: $pkgPath"
        archiveExt="pkgInZip"
+        echo "archiveExt: $archiveExt"
        pkgInvestigation
+    elif [[ $archiveName != "" ]]; then
+        echo "Disk image found: $archiveName"
+        archiveExt="dmgInZip"
+        echo "archiveExt: $archiveExt"
+        dmgInvestigation
    else
        echo "Nothing found in compressed archive."
        exit 9
    fi
-
 fi

+identifier=${name:l} # making lower case
+identifier=${identifier//\%[0-9a-fA-F][0-9a-fA-F]} # removing certain characters
+identifier=${identifier//[ ,._*@$\(\)\-]} # removing more characters from label name
+echo "identifier: $identifier"
+
 # github-part to figure out if we can find author and repo, to use our github functions for the label
 if echo "$downloadURL" | grep -i "github.com.*releases/download"; then
    echo "\n**********\n\nFound GitHub path"
--- a/utils/checkInstallomator.sh
+++ b/utils/checkInstallomator.sh
@@ -0,0 +1,188 @@
+#!/bin/zsh
+
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# Check Installomator with various labels in various modes
+# 2022 Søren Theilgaard (@theilgaard)
+
+# This script will use various labels to check if Installomator is working as it is supposed to do
+
+# To check this script use these labels:
+# desktoppr dbeaverce brave microsoftteams whatsapp citrixworkspace aircall devonthink
+
+
+# MARK: Constants
+
+# Labels to test in DEBUG=2 mode
+allLabels=( dbeaverce signal malwarebytes mochatn3270 logitechoptions googlechrome brave macports inkscape devonthink omnidisksweeper microsoftteams applenyfonts sketch sqlpropostgres desktoppr marathon)
+
+# Labels to test for real (script use sudo to ask for admin rights)
+# Purpose is only toest things that are being skipped in DEBUG mode
+allLabelsArg=(
+"vlc"
+"depnotify NOTIFY=all"
+"brave NOTIFY=silent"
+"dialog"
+"handbrake SYSTEMOWNER=1"
+)
+
+
+## Testing for combinations of these
+# Label types: dmg, pkg, zip, tbz, pkgInDmg, pkgInZip, appInDmgInZip
+# Label fields: packageID, appNewVersion, versionKey, appCustomVersion(){}, archiveName, appName, pkgName
+
+# dbeaverse: dmg without appNewVersion and does not have LSMinimumSystemVersion in Info.plist
+# signal: dmg with appNewVersion
+# malwarebytes: pkg with appNewVersion but not packageID
+# mochatn3270: appInDmgInZip with curlOptions
+# logitechoptions pkgInZip with pkgName but without packageID
+# googlechrome: dmg with appNewVersion
+# brave: dmg with appNewVersion from versionKey
+# macports: with custom code for archiveName, and with appNewVersion and appCustomVersion
+# inkscape: dmg with appCustomVersion
+# devonthink: appInDmgInZip
+# omnidisksweeper: with appNewVersion, and uses xpath
+# microsoftteams: pkg with appNewVersion from packageID
+# applenyfonts: pkgInDmg from Apple with packageID and no appNewVersion
+# sketch: zip with appNewVersion
+# sqlpropostgres: zip without appNewVersion
+# desktoppr: pkg from github with packageID
+# marathon: dmg from github with archiveName
+
+# Label types not possible to test in DEBUG mode: updateronly
+# Label fields not possible to test in DEBUG mode: targetDir, blockingProcesses, updateTool, updateToolRunAsCurrentUser, installerTool, CLIInstaller, CLIArguments
+
+# Labels tested for real
+
+# vlc: app-copy
+# depnotify: pkg-install without appNewVersion
+# brave: app-copy but with few extras
+# dialog: pkg from GitHub
+# handbrake: app-copy
+
+# adobecreativeclouddesktop: dmg with appNewVersion and installerTool, CLIInstaller, CLIArguments
+
+#setup some folders
+script_dir=$(dirname ${0:A})
+repo_dir=$(dirname $script_dir)
+build_dir="$repo_dir/build"
+destination_file="$build_dir/Installomator.sh"
+fragments_dir="$repo_dir/fragments"
+labels_dir="$fragments_dir/labels"
+
+# MARK: Script
+RED='\033[0;31m'
+GREEN='\033[0;32m'
+YELLOW='\033[1;33m'
+BLUE='\033[1;34m'
+NC='\033[0m' # No Color
+
+# Check minimal macOS requirement
+if [[ $(sw_vers -buildVersion ) < "18" ]]; then
+    echo "Installomator requires at least macOS 10.14 Mojave."
+    exit 98
+fi
+
+echo "TESTING Installoamator"
+echo "Version: $($repo_dir/assemble.sh version)"
+echo "\nRemember to follow log in another terminal window (for the REAL tests):"
+echo "tail -f /var/log/Installomator.log\n"
+
+currentUser=$(stat -f "%Su" /dev/console)
+
+warningLabels="" # variable for labels with warnings
+errorLabels="" # variable for labels with errors
+countWarning=0
+countError=0
+
+checkCmd_output() {
+    #echo "$cmd_output"
+    no_appNewVersion=$( echo "$cmd_output" | grep --binary-files=text -ic "Latest version not specified." )
+    echo "No appNewVersion: $no_appNewVersion (1 for no)"
+    latest_appNewVersion=$( echo "$cmd_output" | grep --binary-files=text -i "Latest version of " | sed -E 's/.* is ([0-9.]*),*.*$/\1/g' )
+    echo "Latest version: $latest_appNewVersion"
+    github_label=$( echo "$cmd_output" | grep --binary-files=text -ci "Downloading https://github.com" )
+    echo "GitHub: $github_label (1 for true)"
+    downloaded_version=$( echo "$cmd_output" | grep --binary-files=text -ioE "Downloaded (package.*version|version of.*is) [0-9.]*" | grep -v "is the same as installed" | sed -E 's/.* (is|version) ([0-9.]*).*/\2/g' )
+    echo "Downloaded version: $downloaded_version"
+    exit_status=$( echo "$cmd_output" | grep --binary-files=text exit | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' )
+    echo "Exit: $exit_status"
+    if [[ ${exit_status} -eq 0 ]] ; then
+        if [[ $no_appNewVersion -eq 1 ]]; then
+            echo "${GREEN}$label works fine, but no appNewVersion.${NC}"
+        elif [[ $latest_appNewVersion == $downloaded_version && $github_label -eq 0 ]]; then
+            echo "${GREEN}$label works fine, with version $latest_appNewVersion.${NC}"
+        elif [[ $github_label -eq 1 ]]; then
+            echo "${GREEN}$label works fine, with GitHub version $latest_appNewVersion.${NC}"
+        elif [[ $downloaded_version == "" ]]; then
+            echo "${GREEN}$label works fine, but downloaded version can not be checked without packageID.${NC}"
+        elif [[ $latest_appNewVersion != $downloaded_version && $github_label -eq 0 ]]; then
+            echo "${YELLOW}$label has version warning, with latest $latest_appNewVersion not matching downloaded $downloaded_version.${NC}"
+            ((countWarning++))
+            warningLabels+=( "$label" )
+            echo "$cmd_output"
+        else
+            echo "${RED}$label NOT WORKING:${NC}"
+            ((countError++))
+            errorLabels+=( "$label" )
+            echo "$cmd_output"
+        fi
+    else
+        echo "${RED}$label FAILED with exit code ${exit_status}:${NC}"
+        ((countError++))
+        errorLabels+=( "$label" )
+        echo "$cmd_output"
+    fi
+}
+
+# Mark: First part in DEBUG=2 mode
+for label in $allLabels; do
+    label_name=$( $repo_dir/assemble.sh $label DEBUG=2 RETURN_LABEL_NAME=1 | tail -1 )
+    if [[ "$label_name" == "#" ]]; then
+        echo "${RED}Label $label does not exist. Skipping.${NC}"
+    else
+        echo "Label $label: $label_name"
+        cmd_output=$( $repo_dir/assemble.sh $label DEBUG=2 INSTALL=force IGNORE_APP_STORE_APPS=yes BLOCKING_PROCESS_ACTION=ignore )
+        #echo "$cmd_output"
+        checkCmd_output
+        echo
+    fi
+done
+
+# Mark: Testing for real
+echo "\nTesting for REAL:\n"
+
+for labelArg in $allLabelsArg; do
+    echo $labelArg
+    label=$(echo $labelArg | cut -d" " -f1 )
+    arg1=$(echo $labelArg | cut -d" " -f2 )
+    arg2=$(echo $labelArg | cut -d" " -f3 )
+    label_name=$( $repo_dir/assemble.sh $label DEBUG=2 RETURN_LABEL_NAME=1 | tail -1 )
+    if [[ "$label_name" == "#" ]]; then
+        echo "${RED}Label $label does not exist. Skipping.${NC}"
+    else
+        echo "Label $label: $label_name"
+        cmd_output=$( sudo $repo_dir/assemble.sh $label $arg1 $arg2 DEBUG=0 LOGGING=DEBUG INSTALL=force BLOCKING_PROCESS_ACTION=quit )
+        #echo "$cmd_output"
+        argument_variables=$( echo "$cmd_output" | grep --binary-files=text -i "setting variable from argument" | sed -E 's/.*setting variable from argument (.*)$/\1/g')
+        echo $argument_variables
+        checkCmd_output
+        echo
+    fi
+done
+
+echo
+if [[ countWarning -gt 0 ]]; then
+    echo "${YELLOW}Warnings counted: $countWarning${NC}"
+    echo "${YELLOW}${warningLabels}${NC}"
+else
+    echo "${GREEN}No warnings detected!${NC}"
+fi
+if [[ countError -gt 0 ]]; then
+    echo "${RED}ERRORS counted: $countError${NC}"
+    echo "${YELLOW}${errorLabels}${NC}"
+else
+    echo "${GREEN}No errors detected!${NC}"
+fi
+
+echo "Done!"
--- a/utils/checkLabels.sh
+++ b/utils/checkLabels.sh
@@ -3,7 +3,7 @@
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin

 # Check Installomator labels from fragments
-# 2021 Søren Theilgaard (@theilgaard)
+# 2021-2022 Søren Theilgaard (@theilgaard)

 # This script will test labels and check if download link is active, and if version is defined.
 # If labels are written to the script only those will be tested.
@@ -89,6 +89,45 @@ arch () {
    echo $fixedArch
 }

+checkCmd_output() {
+    #echo "$cmd_output"
+    no_appNewVersion=$( echo "$cmd_output" | grep --binary-files=text -ic "Latest version not specified." )
+    echo "No appNewVersion: $no_appNewVersion (1 for no)"
+    latest_appNewVersion=$( echo "$cmd_output" | grep --binary-files=text -i "Latest version of " | sed -E 's/.* is ([0-9.]*),*.*$/\1/g' )
+    echo "Latest version: $latest_appNewVersion"
+    github_label=$( echo "$cmd_output" | grep --binary-files=text -ci "Downloading https://github.com" )
+    echo "GitHub: $github_label (1 for true)"
+    downloaded_version=$( echo "$cmd_output" | grep --binary-files=text -ioE "Downloaded (package.*version|version of.*is) [0-9.]*" | grep -v "is the same as installed" | sed -E 's/.* (is|version) ([0-9.]*).*/\2/g' )
+    echo "Downloaded version: $downloaded_version"
+    exit_status=$( echo "$cmd_output" | grep --binary-files=text exit | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' )
+    echo "Exit: $exit_status"
+    if [[ ${exit_status} -eq 0 ]] ; then
+        if [[ $no_appNewVersion -eq 1 ]]; then
+            echo "${GREEN}$label works fine, but no appNewVersion.${NC}"
+        elif [[ $latest_appNewVersion == $downloaded_version && $github_label -eq 0 ]]; then
+            echo "${GREEN}$label works fine, with version $latest_appNewVersion.${NC}"
+        elif [[ $github_label -eq 1 ]]; then
+            echo "${GREEN}$label works fine, with GitHub version $latest_appNewVersion.${NC}"
+        elif [[ $downloaded_version == "" ]]; then
+            echo "${GREEN}$label works fine, but downloaded version can not be checked without packageID.${NC}"
+        elif [[ $latest_appNewVersion != $downloaded_version && $github_label -eq 0 ]]; then
+            echo "${YELLOW}$label has version warning, with latest $latest_appNewVersion not matching downloaded $downloaded_version.${NC}"
+            ((countWarning++))
+            warningLabels+=( "$label" )
+            echo "$cmd_output"
+        else
+            echo "${RED}$label NOT WORKING:${NC}"
+            ((countError++))
+            errorLabels+=( "$label" )
+            echo "$cmd_output"
+        fi
+    else
+        echo "${RED}$label FAILED with exit code ${exit_status}:${NC}"
+        ((countError++))
+        errorLabels+=( "$label" )
+        echo "$cmd_output"
+    fi
+}

 # MARK: Script
 RED='\033[0;31m'
@@ -97,132 +136,164 @@ YELLOW='\033[1;33m'
 BLUE='\033[1;34m'
 NC='\033[0m' # No Color

-# Labels with the $(arch) call for different versions for Intel and Apple Silicon should be listed here:
-archLabels=( $(grep "\$(arch)" ${labels_dir}/* | awk '{print $1}' | sed -E 's/.*\/([a-z0-9\_-]*)\..*/\1/g'| uniq ) )
-echo "${BLUE}Labels with \"\$(arch)\" call:${NC}\n${archLabels}\n"
-
+# Has label(s) been given as arguments or not, and list those
+# Figure out which ones of these include "$(arch)" so those will be testet for both i386 and arm64 architectures
 if [[ $# -eq 0 ]]; then
    allLabels=( $(grep -h -E '^([a-z0-9\_-]*)(\)|\|\\)$' ${labels_dir}/*.sh | tr -d ')|\\' | sort) )
+    archLabels=( $(grep "\$(arch)" ${labels_dir}/* | awk '{print $1}' | sed -E 's/.*\/([a-z0-9\_-]*)\..*/\1/g'| uniq ) )
 else
    allLabels=( ${=@} )
+    # Check if labels exist
+    for checkLabel in $allLabels; do
+        if [ ! $(ls ${labels_dir}/${checkLabel}.sh 2>/dev/null) ] ; then
+            # Remove label from array
+            allLabels=("${(@)allLabels:#$checkLabel}")
+        fi
+    done
+    # Figure out if labels has "$(arch)" in them
+    archLabels=( $allLabels )
+    for checkLabel in $archLabels; do
+        if [ ! -n "$(grep "\$(arch)" ${labels_dir}/${checkLabel}.sh 2>/dev/null)" ] ; then
+            # Remove label from array
+            archLabels=("${(@)archLabels:#$checkLabel}")
+        fi
+    done
 fi
+
 echo "${BLUE}Total labels:${NC}\n${allLabels}\n"
+echo "${BLUE}Labels with \"\$(arch)\" call:${NC}\n${archLabels}\n"

 secondRoundLabels="" # variable for labels with $(arch) call in them
+warningLabels="" # variable for labels with warnings
+errorLabels="" # variable for labels with errors
 countWarning=0
 countError=0
+
+# Loop through the 2 architectures
 for fixedArch in i386 arm64; do
-echo "${BLUE}Architecture: $fixedArch${NC}"
-echo
+    echo "${BLUE}Architecture: $fixedArch${NC}"
+    echo

-# Go through all labels
-for label in $allLabels; do
-    echo "########## $label"
-    labelWarning=0; labelError=0; expectedExtension=""; URLextension=""
-    name=""; type=""; downloadURL=""; appNewVersion=""; expectedTeamID=""; blockingProcesses=""; updateTool=""; updateToolArguments=""; archiveName=""
-    
-    #caseLabel
-    if cat "${labels_dir}/${label}.sh" | grep -v -E '^[a-z0-9\_-]*(\)|\|\\)$' | grep -v ";;" > checkLabelCurrent.sh; then
-        source checkLabelCurrent.sh
+    # Loop through all labels
+    for label in $allLabels; do
+        echo "########## $label"
+        labelWarning=0; labelError=0; expectedExtension=""; URLextension=""
+        name=""; type=""; downloadURL=""; curlOptions=""; appNewVersion=""; expectedTeamID=""; blockingProcesses=""; updateTool=""; updateToolArguments=""; archiveName=""
+        
+        #caseLabel
+        if cat "${labels_dir}/${label}.sh" | grep -v -E '^[a-z0-9\_-]*(\)|\|\\)$' | grep -v ";;" > checkLabelCurrent.sh; then
+            source checkLabelCurrent.sh

-        echo "Name: $name"
-        echo "Download URL: $downloadURL"
-        echo "Type: $type"
-        case $type in
-            dmg|pkg|zip|tbz)
-                expectedExtension="$type"
-                ;;
-            pkgInDmg)
-                expectedExtension="dmg"
-                ;;
-            *InZip)
-                expectedExtension="zip"
-                ;;
-            *)
-                echo "Cannot handle type $type"
-                ;;
-        esac
-        if [[ "$appNewVersion" == "" ]] ; then
-            echo "No appNewVersion!"
-        else
-            if [[ $( echo "$appNewVersion" | grep -i "[0-9.]" ) == "" || $appNewVersion == "" ]]; then
-                echo "${RED}-> !! ERROR in appNewVersion${NC}"
-                labelError=1
+            echo "Name: $name"
+            echo "Download URL: $downloadURL"
+            echo "Type: $type"
+            case $type in
+                dmg|pkg|zip|tbz)
+                    expectedExtension="$type"
+                    ;;
+                pkgInDmg)
+                    expectedExtension="dmg"
+                    ;;
+                *InZip)
+                    expectedExtension="zip"
+                    ;;
+                *)
+                    echo "Cannot handle type $type"
+                    ;;
+            esac
+            if [[ "$appNewVersion" == "" ]] ; then
+                echo "No appNewVersion!"
            else
-                if [[ $appNewVersion != $( echo "$appNewVersion" | sed -E 's/[^0-9]*([0-9.]*)[^0-9]*/\1/g' ) ]]; then
-                    echo "${YELLOW}Warning: Version contain not only numbers and dots.${NC}"
-                    labelWarning=1
+                if [[ $( echo "$appNewVersion" | grep -i "[0-9.]" ) == "" || $appNewVersion == "" ]]; then
+                    echo "${RED}-> !! ERROR in appNewVersion${NC}"
+                    labelError=1
+                else
+                    if [[ $appNewVersion != $( echo "$appNewVersion" | sed -E 's/[^0-9]*([0-9.]*)[^0-9]*/\1/g' ) ]]; then
+                        echo "${YELLOW}Warning: Version contain not only numbers and dots.${NC}"
+                        labelWarning=1
+                    fi
+                    echo "Version: $appNewVersion" ;
                fi
-                echo "Version: $appNewVersion" ;
            fi
-        fi
-        if curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
-            echo "${GREEN}OK: downloadURL works OK${NC}"
-            if [[ $(echo "$downloadURL" | sed -E 's/.*\.([a-zA-Z]*)\s*/\1/g' ) == "${expectedExtension}" ]]; then
-                echo "${GREEN}OK: download extension MATCH on ${expectedExtension}${NC}"
-            else
-                if [[ $(echo "$downloadURL" | grep -io "github.com") != "github.com" ]]; then
-                    URLheader=$( curl -fsIL "$downloadURL" )
-                    if [[ "${URLheader}" != "" ]]; then
-                        URLlocation=$( echo "${URLheader}" | grep -i "^location" )
-                        URLfilename=$( echo "${URLheader}" | grep -i "filename=" )
-                        if [[ "${URLlocation}" != "" ]]; then
-                            URLextension=$( echo "${URLlocation}" | tail -1 | sed -E 's/.*\.([a-zA-Z]*)\s*/\1/g' | tr -d '\r\n' )
+            if curl -sfL ${curlOptions} --output /dev/null -r 0-0 "$downloadURL" ; then
+                echo "${GREEN}OK: downloadURL works OK${NC}"
+                if [[ $(echo "$downloadURL" | sed -E 's/.*\.([a-zA-Z]*)\s*/\1/g' ) == "${expectedExtension}" ]]; then
+                    echo "${GREEN}OK: download extension MATCH on ${expectedExtension}${NC}"
+                else
+                    if [[ $(echo "$downloadURL" | grep -io "github.com") != "github.com" ]]; then
+                        URLheader=$( curl -fsIL "$downloadURL" )
+                        if [[ "${URLheader}" != "" ]]; then
+                            URLlocation=$( echo "${URLheader}" | grep -i "^location" )
+                            URLfilename=$( echo "${URLheader}" | grep -i "filename=" )
+                            if [[ "${URLlocation}" != "" ]]; then
+                                URLextension=$( echo "${URLlocation}" | tail -1 | sed -E 's/.*\.([a-zA-Z]*)\s*/\1/g' | tr -d '\r\n' )
+                            else
+                                URLextension=$( echo "${URLfilename}" | tail -1 | sed -E 's/.*\.([a-zA-Z]*)\s*/\1/g' | tr -d '\r\n' )
+                            fi
+                            URLextension=${${URLextension:l}%%\?*}
+                            if [[ "${URLextension}" == "${expectedExtension}" ]]; then
+                                echo "${GREEN}OK: download extension MATCH on ${URLextension}${NC}"
+                            else
+                                echo "${RED}-> !! ERROR in download extension, expected ${expectedExtension}, but got ${URLextension}.${NC}"
+                                labelError=1
+                            fi
                        else
-                            URLextension=$( echo "${URLfilename}" | tail -1 | sed -E 's/.*\.([a-zA-Z]*)\s*/\1/g' | tr -d '\r\n' )
+                            echo "no header provided from server."
                        fi
-                        URLextension=${${URLextension:l}%%\?*}
-                        if [[ "${URLextension}" == "${expectedExtension}" ]]; then
-                            echo "${GREEN}OK: download extension MATCH on ${URLextension}${NC}"
+                    else
+                        githubPart="$(echo "$downloadURL" | cut -d "/" -f4-6)"
+                        if [[ "$(curl -fsL "$downloadURL" | grep -io "${githubPart}.*\.${expectedExtension}")" != "" ]]; then
+                            echo "${GREEN}OK: download extension MATCH on ${expectedExtension}${NC}"
                        else
-                            echo "${RED}-> !! ERROR in download extension, expected ${expectedExtension}, but got ${URLextension}.${NC}"
+                            echo "${RED}-> !! ERROR in download extension, expected ${expectedExtension}, but it was wrong${NC}"
                            labelError=1
                        fi
-                    else
-                        echo "no header provided from server."
-                    fi
-                else
-                    githubPart="$(echo "$downloadURL" | cut -d "/" -f4-6)"
-                    if [[ "$(curl -fsL "$downloadURL" | grep -io "${githubPart}.*\.${expectedExtension}")" != "" ]]; then
-                        echo "${GREEN}OK: download extension MATCH on ${expectedExtension}${NC}"
-                    else
-                        echo "${RED}-> !! ERROR in download extension, expected ${expectedExtension}, but it was wrong${NC}"
-                        labelError=1
                    fi
                fi
+            else
+                echo "${RED}-> !! ERROR in downloadURL${NC}"
+                labelError=1
+            fi
+            if [[ $labelError != 0 || $labelWarning != 0 ]]; then
+                echo "${RED}########## ERROR in label: $label${NC}"
+                    echo "Testing using Installomator"
+                    #exit_status=$( . $repo_dir/assemble.sh $label DEBUG=2 INSTALL=force IGNORE_APP_STORE_APPS=yes BLOCKING_PROCESS_ACTION=ignore | grep exit | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' )
+                    cmd_output=$( $repo_dir/assemble.sh $label DEBUG=2 INSTALL=force IGNORE_APP_STORE_APPS=yes BLOCKING_PROCESS_ACTION=ignore )
+                    #echo "$cmd_output"
+                    checkCmd_output
+                fi
+            if (($archLabels[(Ie)$label])); then
+                secondRoundLabels+=( "$label" )
            fi
        else
-            echo "${RED}-> !! ERROR in downloadURL${NC}"
-            labelError=1
-        fi
-        if [[ $labelWarning != 0 ]]; then; echo "${YELLOW}########## Warning in label: $label${NC}"; ((countWarning++)); fi
-        if [[ $labelError != 0 ]]; then; echo "${RED}########## ERROR in label: $label${NC}"; ((countError++)); fi
-
-        if (($archLabels[(Ie)$label])); then
-            secondRoundLabels+=( "$label" )
+            echo "Label: ${label} is not it's own file in Labels-folder. Skipping"
        fi
+        echo
+    done
+    if [[ $fixedArch == i386 ]] ; then
+        errorLabelsi386=( ${=errorLabels} )
    else
-        echo "Label: ${label} is not it's own file in Labels-folder. Skipping"
+        errorLabelsarm64=( ${=errorLabels} )
    fi
+
+    errorLabels=""
+    allLabels=( ${=secondRoundLabels} )
+    archLabels=()
    echo
 done
-allLabels=( ${=secondRoundLabels} )
-archLabels=()
-echo
-done

 rm checkLabelCurrent.sh

-#${SELFLOCATION}/Installomator.sh version
-#echo
-
-if [[ countWarning > 0 ]]; then
+if [[ countWarning -gt 0 ]]; then
    echo "${YELLOW}Warnings counted: $countWarning${NC}"
+    echo "${YELLOW}${warningLabels}${NC}"
 else
    echo "${GREEN}No warnings detected!${NC}"
 fi
-if [[ countError > 0 ]]; then
+if [[ countError -gt 0 ]]; then
    echo "${RED}ERRORS counted: $countError${NC}"
+    echo "${RED}i386 : ${errorLabelsi386}${NC}"
+    echo "${RED}arm64: ${errorLabelsarm64}${NC}"
 else
    echo "${GREEN}No errors detected!${NC}"
 fi
@@ -1 +1 @@
 .0
 .1beta