updated changelog and main script

New Label: SynologyAssistant

CHANGELOG.md

@@ -1,3 +1,100 @@
+## v10beta2
+
+- fixed problem with GitHub labels (#659)
+- bz2 archive support (#659)
+- fixed WorkspaceOne support (#653)
+
+Plus everything from v10beta1
+
+- new labels:
+	- abetterfinderrename11 (#552)
+	- carboncopycloner (#553)
+	- cocoapods (#659)
+	- coconutbattery (#588)
+	- cricutdesignspace (#562)
+	- dynalist (#591)
+	- fellow (#591)
+	- flexoptixapp (#554)
+	- googleadseditor (#652, #541)
+	- kap (#568)
+	- keepingyouawake (#549)
+	- lcadvancedvpnclient (#584)
+	- masv (#569)
+	- merlinproject (#555)
+	- mongodbcompass (#654)
+	- netspot (#556)
+	- relatel (#619)
+	- sonicvisualiser (#575)
+	- strongdm (#559)
+	- synologyassistant (#557)
+	- synologydriveclient (#582)
+	- tencentmeeting (#570)
+	- typinator (#583)
+	- xcreds (#675)
+- updated labels:
+	- acroniscyberprotectconnect/remotix (#664)
+	- acroniscyberprotectconnectagent/remotixagent (#664)
+	- awsvpnclient (#586)
+	- boxtools (#589)
+	- clevershare2 (#664)
+	- coderunner (#664)
+	- colourcontrastanalyser (#664)
+	- cryptomator (#664)
+	- dangerzone (#664)
+	- drawio (#664)
+	- golang (#664)
+	- icons (#664)
+	- insomnia (#664)
+	- knockknock (#664)
+	- libreoffice (#672)
+	- macports
+	- opera (#664)
+	- supportapp (#664)
+	- vmwarehorizonclient (#645, #511)
+- deleted/deactivated labels:
+	- microsoftyammer (#664)
+	- wickrme (#664)
+	- wickrpro (#664)
+
+
+## v10beta1
+
+- [swiftDialog](https://github.com/bartreardon/swiftDialog) integration (#641, #632), many thanks to @bartreardon, [sample scripts](in the MDM folder)
+- added WorkspaceOne option for LOGO (#517)
+- added function for JSON parsing with JXA (#529)
+- updated assemble.sh script to update Labels.txt when script is rebuilt (#540)
+- added a no requisite install script (#493)
+- GitHub lookup now don't use API calls, this should avoid or at least reduce rate limiting (#543)
+- fixed redundant exit codes (#643, #561)
+
+NOTE: some exit codes have changed! see [Installomator Exit Codes](https://github.com/Installomator/Installomator/wiki/Installomator-Exit-Codes) for a list
+
+- new labels:
+	- bluejeanswithaudiodriver (#473)
+	- duodevicehealth (#548)
+	- googlechromeenterprise (#532)
+	- ipswupdater (#545)
+	- mmhmm (#571)
+	- nordlayer (#419)
+	- prune (#538)
+	- whatroute (#560)
+- updated labels:
+	- blender (#535, #622)
+	- camtasia2019 (#547)
+	- clickshare (#565)
+	- egnyte (#500)
+	- googledrive (#563)
+	- grammarly (#576)
+	- marathon, marathon2, marathoninfinity (#544)
+	- miro (#475, #539)
+	- notion (#566)
+	- ringcentralapp (#550)
+	- sublimetext (#593, #578, #567, #623, #626)
+	- talkdeskcallbar (#536)
+	- talkdeskcxcloud (#537)
+	- wireshark (#585)
+
+
 ## v9.2
 
 **Note**: Both Google and Mozilla recommend using the pkg installers instead of the dmg downloads for managed deployments. So far, Installomator has provided labels for both. (`googlechrome` and `googlechromepkg` or `firefox` and `firefoxpkg`, respectively) Since there are problems with the dmg downloads, a future release of Installomator will _disable_ the `firefox` and `googlechrome` dmg labels. You should switch to using `googlechromepkg` and `firefoxpkg` labels instead.

CONTRIBUTING.md

@@ -1,33 +1,35 @@
 # Contributing to Installomator
 
-__Please note, that if you are contributing to this project with new labels or other suggestions in PRs, please put your changes in the files 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.__
+__Please note, that if you are contributing to this project with new labels or other suggestions in PRs, please put your changes in the files in the `fragments` sub-folder. DO NOT edit the full `Installomator.sh` script. The full script is generated from the fragments, and will be overwritten. More details on [how the script is assembled from the fragments here](https://github.com/Installomator/Installomator/tree/main/utils#how-to-assemble-installomatorsh).__
 
-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.
+We try to keep the script as short as possible, and with more than 400 labels, we can save 400 lines in the script, if we do not have credit lines on each of these. So we are thankful for your contribution, but we will be removing these lines in the coming releases.
 
 ## 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
+- `main`: (default) this branch will be the current build we are working on. It includes new and updated app labels, and critical bug fixes
+- `dev`: this will contain new and updated app labels, as well as other code changes that have the risk of significantly changing or breaking behavior
+there will be other branches for new features and testing.
 
 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!
+Please make sure you branch off of main for your PRs.
+
+__Thank you for contributing!__
 
 ## Labels
 
-If you need a new label for a piece of software, please take a look at the tutorials in the Wiki, 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](https://github.com/Installomator/Installomator/wiki#tutorials), those can be helpful for starting out on the creation of the label.
 
 We expect you to try out finding the __version__ of the software online, so that `appNewVersion` can be filled in the label. It helps a lot when the software needs update, and greatly improve user experience.
 
 Please document what you found out about the __version__ of the software if it's not included. We will not accept a new label if this is not documented, we will ask about this if it was not included. This is very important for the quality and reliability of Installomator.
 
-When creating a new label, please file a pull request (PR). And feel free to ask questions or make your comments about what else is needed, if we should take a look at the label, or help out in finding the version or isolating URLs or anything else.
+When creating a new label, please file a pull request (PR). And feel free to ask questions or make your comments about what else is needed, if we should take a look at the label, or help out in finding the version or isolating URLs or anything else. You can find [a tutorial on how to create a PR here](https://github.com/Installomator/Installomator/wiki/GitHub-howto-create-PRs).
 
 Please include the log of installing this label in the description, like this:
 ```
@@ -39,11 +41,13 @@ Please include the log of installing this label in the description, like this:
 
 Please have one label per PR, so we can separate these. Also if you change/fix a label.
 
-Thank you very much for your contribution!
+__Thank you very much for your contribution!__
 
 
 ## Issues
 
-Do not create an issue just when you have a questions, but do file an issue or pull request (PR) for bugs or wrong behavior. Include the full log and include the version of Installomator you're running.
+Do not create an issue just when you have a questions, but do file an issue or pull request (PR) for bugs or wrong behavior. Include the full log and include the version of Installomator you're running. When you create a PR to follow-up and solve an issue make sure to [mention the issue using the `#xxx` syntax in a commit message or comment to link the issue](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
+
+Join [the MacAdmins Slack](https://macadmins.org) and find us in the `#installomator` channel for questions, support and discussions. 
 
 When in doubt, use the MacAdmins.org Slack as described in [README.md](https://github.com/Installomator/Installomator/)

Labels.txt

@@ -3,7 +3,10 @@
 1passwordcli
 4kvideodownloader
 8x8
+abetterfinderrename11
 abstract
+acroniscyberprotectconnect
+acroniscyberprotectconnectagent
 adobebrackets
 adobeconnect
 adobecreativeclouddesktop
@@ -56,6 +59,7 @@ bettertouchtool
 bitwarden
 blender
 bluejeans
+bluejeanswithaudiodriver
 boxdrive
 boxsync
 boxtools
@@ -68,8 +72,10 @@ calibre
 camostudio
 camtasia
 camtasia2019
+camtasia2020
 camtasia2021
 canva
+carboncopycloner
 chatwork
 cisdem-documentreader
 citrixworkspace
@@ -80,12 +86,15 @@ closeio
 cloudya
 clue
 cluefull
+cocoapods
+coconutbattery
 code42
 coderunner
 colourcontrastanalyser
 cormorant
 craftmanager
 craftmanagerforsketch
+cricutdesignspace
 cryptomator
 cyberduck
 daisydisk
@@ -109,6 +118,8 @@ drawio
 drift
 dropbox
 duckduckgo
+duodevicehealth
+dynalist
 easeusdatarecoverywizard
 easyfind
 egnyte
@@ -123,6 +134,7 @@ exifrenamer
 fantastical
 fastscripts
 favro
+fellow
 ferdi
 figma
 filezilla
@@ -135,6 +147,7 @@ firefoxesr_intl
 firefoxesrpkg
 firefoxpkg
 firefoxpkg_intl
+flexoptixapp
 flowjo
 flux
 flycut
@@ -144,7 +157,9 @@ fsmonitor
 gimp
 githubdesktop
 golang
+googleadseditor
 googlechrome
+googlechromeenterprise
 googlechromepkg
 googledrive
 googledrivebackupandsync
@@ -180,6 +195,7 @@ insomnia
 installomator
 installomator_theile
 intellijideace
+ipswupdater
 istatmenus
 iterm2
 itsycal
@@ -199,8 +215,10 @@ jetbrainspycharmce
 jetbrainsrubymine
 jetbrainstoolbox
 jetbrainswebstorm
+kap
 karabinerelements
 keepassxc
+keepingyouawake
 keka
 keybase
 keyboardmaestro
@@ -210,6 +228,7 @@ krisp
 krita
 lastpass
 launchbar
+lcadvancedvpnclient
 lexarrecoverytool
 libreoffice
 linear
@@ -229,8 +248,10 @@ malwarebytes
 marathon
 marathon2
 marathoninfinity
+masv
 mattermost
 menumeters
+merlinproject
 microsoftautoupdate
 microsoftazuredatastudio
 microsoftazurestorageexplorer
@@ -254,25 +275,28 @@ microsoftskypeforbusiness
 microsoftteams
 microsoftvisualstudiocode
 microsoftword
-microsoftyammer
 mightymike
 mindmanager
 miro
+mmhmm
 mobikinassistantforandroid
 mochakeyboard
 mochatelnet
 mochatn3270
 mochatn3812
 mochatn5250
+mongodbcompass
 montereyblocker
 mowgliiitsycal
 musescore
 muzzle
 nanosaur
 netnewswire
+netspot
 nextcloud
 nomad
 nomadlogin
+nordlayer
 notion
 nudge
 nvivo
@@ -316,6 +340,7 @@ promiseutilityr
 propresenter7
 protonvpn
 proxyman
+prune
 pycharmce
 pymol
 qgis-pr
@@ -324,6 +349,7 @@ ramboxce
 rancherdesktop
 rectangle
 redeye
+relatel
 remotedesktopmanagerenterprise
 remotedesktopmanagerfree
 remotix
@@ -368,6 +394,7 @@ snagit2020
 snagit2021
 snagit2022
 snapgeneviewer
+sonicvisualiser
 sonobus
 sonos
 sonoss1
@@ -378,6 +405,7 @@ spotify
 sqlpropostgres
 sqlprostudio
 steelseriesengine
+strongdm
 strongsync
 sublimetext
 superhuman
@@ -386,6 +414,8 @@ suspiciouspackage
 swiftdialog
 swiftruntimeforcommandlinetools
 sync
+synologyassistant
+synologydriveclient
 tableaudesktop
 tableaupublic
 tableaureader
@@ -399,6 +429,7 @@ teamviewerqs
 techsmithcapture
 telegram
 tembo
+tencentmeeting
 textexpander
 textmate
 theunarchiver
@@ -412,6 +443,7 @@ torbrowser
 trex
 tunnelbear
 tunnelblick
+typinator
 typora
 ultimakercura
 umbrellaroamingclient
@@ -436,12 +468,12 @@ webex
 webexmeetings
 webexteams
 wechat
+whatroute
 whatsapp
-wickrme
-wickrpro
 wireshark
 wordservice
 wwdc
+xcreds
 xeroxphaser7800
 xeroxworkcentre7800
 xink

MDM/InstallInstallomator.sh

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+# This script is meant to povide the simplest MDM/management platform agnostic way to install Installomator
+# The only requirement is an Internet connection
+
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# Get the URL of the latest PKG From the Installomator GitHub repo
+url=$(curl --silent --fail "https://api.github.com/repos/Installomator/Installomator/releases/latest" | awk -F '"' "/browser_download_url/ && /pkg\"/ { print \$4; exit }")
+# Expected Team ID of the downloaded PKG
+expectedTeamID="JME5BW3F3R"
+exitCode=0
+
+# Check for Installomator and install if not found
+if [ ! -e "/usr/local/Installomator/Installomator.sh" ]; then
+  echo "Installomator not found. Installing."
+  # Create temporary working directory
+  tempDirectory=$( mktemp -d )
+  echo "Created working directory '$tempDirectory'"
+  # Download the installer package
+  echo "Downloading Installomator package"
+  curl --location --silent "$url" -o "$tempDirectory/Installomator.pkg"
+  # Verify the download
+  teamID=$(spctl -a -vv -t install "$tempDirectory/Installomator.pkg" 2>&1 | awk '/origin=/ {print $NF }' | tr -d '()')
+  echo "Team ID for downloaded package: $teamID"
+  # Install the package if Team ID validates
+  if [ "$expectedTeamID" = "$teamID" ] || [ "$expectedTeamID" = "" ]; then
+    echo "Package verified. Installing package Installomator.pkg"
+    installer -pkg "$tempDirectory/Installomator.pkg" -target / -verbose
+    exitCode=$?
+  else
+    echo "Package verification failed before package installation could start. Download link may be invalid. Aborting."
+    exitCode=1
+    exit $exitCode
+  fi
+  # Remove the temporary working directory when done
+  echo "Deleting working directory '$tempDirectory' and its contents"
+  rm -Rf "$tempDirectory"
+else
+  echo "Installomator already installed."
+fi
+
+exit $exitCode

MDM/Jamf/00_Prepare_SwiftDialog.sh

@@ -0,0 +1,69 @@
+#!/bin/zsh
+
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# MARK: Arguments/Parameters
+
+# Parameter 4: path to the swiftDialog command file
+dialog_command_file=${4:-"/var/tmp/dialog.log"}
+
+# Parameter 5: message displayed over the progress bar
+message=${5:-"Self Service Progress"}
+
+# Parameter 6: path or URL to an icon
+icon=${6:-"/System/Applications/App Store.app/Contents/Resources/AppIcon.icns"}
+# see Dan Snelson's advice on how to get a URL to an icon in Self Service
+# https://rumble.com/v119x6y-harvesting-self-service-icons.html
+
+# MARK: Constants
+
+dialogApp="/Library/Application Support/Dialog/Dialog.app"
+
+# MARK: Functions
+
+dialogUpdate() {
+    # $1: dialog command
+    local dcommand="$1"
+
+    if [[ -n $dialog_command_file ]]; then
+        echo "$dcommand" >> "$dialog_command_file"
+        echo "Dialog: $dcommand"
+    fi
+}
+
+# MARK: sanity checks
+
+# check minimal macOS requirement
+if [[ $(sw_vers -buildVersion ) < "20A" ]]; then
+    echo "This script requires at least macOS 11 Big Sur."
+    exit 98
+fi
+
+# check we are running as root
+if [[ $DEBUG -eq 0 && $(id -u) -ne 0 ]]; then
+    echo "This script should be run as root"
+    exit 97
+fi
+
+# check for Swift Dialog
+if [[ ! -d $dialogApp ]]; then
+    echo "Cannot find dialog at $dialogApp"
+    exit 95
+fi
+
+
+# MARK: Configure and display swiftDialog
+
+# display first screen
+open -a "$dialogApp" --args \
+        --title none \
+        --icon "$icon" \
+        --message "$message" \
+        --mini \
+        --progress 100 \
+        --position bottomright \
+        --movable \
+        --commandfile "$dialog_command_file"
+
+# give everything a moment to catch up
+sleep 0.1

MDM/Jamf/ReadMe.md

@@ -0,0 +1,48 @@
+# Display Installomator Progress with SwiftDialog in Jamf
+
+Installomator 10 has functionality to communicate with [Bart Reardon's swiftDialog](https://github.com/bartreardon/swiftDialog). When you set the `DIALOG_CMD_FILE` variable Installomator will write progress for downloads and installation (with pkgs) to the command file which allows swiftDialog to display the progress.
+
+However, you have to launch and setup swiftDialog to display a window with a progress bar before Installomator launches and also make sure swiftDialog quits after Installomator has run. This may seem complex at first but allows to configure swiftDialog just for your case without needing to modify the Installomator script.
+
+Here are some example script that would run before and after Installomator to display a swiftDialog window and quit the process after. Since Jamf Pro executes scripts in alphanumerical order, the names are chosen accordingly, to ensure proper order.
+
+## Setup in Jamf Pro
+
+To show Installomator progress with swiftDialog from a Jamf Policy, you require three scripts:
+
+- `00_Prepare_SwiftDialog.sh`: Configures and displays the swiftDialog window
+- `Installomator.sh`: (v10 or higher)
+- `zz_Quit_SwiftDialog.sh`: quits swiftDialog
+
+Add these three scripts to your Jamf Pro and create a policy with these three scripts. The names are chosen that the script appear in the correct order. If you rename the scripts in Jamf Pro, this may disrupt the order and the workflow will not work anymore. The "Priority" of the scripts in the policy should all be the same value.
+
+The different scripts require a set of parameters. We will use the `googlechromepkg` label as an example.
+
+`00_Prepare_SwiftDialog.sh`
+
+Parameter 4: `/var/tmp/dialog` (Path to the swiftDialog command file)
+
+Parameter 5: `Installing Google Chrome...` (text shown in the swiftDialog window above the progress bar)
+
+Parameter 6: Path to or URL for an icon in swiftDialog. This can be a path on the client or a URL. See Dan Snelson's advice on how to get icon URLs for Self Service icons: https://rumble.com/v119x6y-harvesting-self-service-icons.html
+
+`Installomator.sh`
+
+Parameter 4: `googlechromepkg` (the label to install)
+
+Parameter 5: `DIALOG_CMD_FILE=\var\log\dialog.log` (the swiftDialog command file, this has to be the same value as parameter 4 in the previous script)
+
+Parameter 6: `NOTIFY=silent` (disable Installomator notifications, optional)
+
+You can add more configurations to the Installomator script when needed.
+
+`zz_Quit_SwiftDialog`
+
+Parameter 4: `/var/log/dialog.log` (the swiftDialog command file, this has to be the same value as parameter 4 in the first script)
+
+Then setup the remainder of the Jamf Policy to your needs. This works best with Self Service policies.
+
+When you run the policy, the first script will configure and display swiftDialog. Installomator.sh will download and install the app while writing the proper update commands to the file set in `DIALOG_CMD_FILE`. The final script will quit swiftDialog.
+
+![](SelfServiceProgress.png)
+

MDM/Jamf/zz_Quit_SwiftDialog.sh

@@ -0,0 +1,57 @@
+#!/bin/zsh
+
+# MARK: Arguments/Parameters
+
+# Parameter 4: path to the swiftDialog command file
+dialog_command_file=${4:-"/var/tmp/dialog.log"}
+
+# MARK: Constants
+dialogApp="/Library/Application Support/Dialog/Dialog.app"
+
+dialogUpdate() {
+    # $1: dialog command
+    local dcommand="$1"
+
+    if [[ -n $dialog_command_file ]]; then
+        echo "$dcommand" >> "$dialog_command_file"
+        echo "Dialog: $dcommand"
+    fi
+}
+
+# check minimal macOS requirement
+if [[ $(sw_vers -buildVersion ) < "20A" ]]; then
+    echo "This script requires at least macOS 11 Big Sur."
+    exit 98
+fi
+
+# check we are running as root
+if [[ $DEBUG -eq 0 && $(id -u) -ne 0 ]]; then
+    echo "This script should be run as root"
+    exit 97
+fi
+
+# check for Swift Dialog
+if [[ ! -d $dialogApp ]]; then
+    echo "Cannot find dialog at $dialogApp"
+    exit 95
+fi
+
+
+# close and quit dialog
+dialogUpdate "progress: complete"
+dialogUpdate "progresstext: Done"
+
+# pause a moment
+sleep 0.5
+
+dialogUpdate "quit:"
+
+# let everything catch up
+sleep 0.5
+
+# just to be safe
+killall "Dialog"
+
+# the killall command above will return error when Dialog is already quit
+# but we don't want that to register as a failure in Jamf,  so always exit 0
+exit 0

MDM/swiftdialog_example.sh

@@ -0,0 +1,151 @@
+#!/bin/zsh
+
+# runs through a list of Installomator items
+# and displays status using Swift Dialog
+#
+# dependencies:
+# - Swift Dialog:    https://github.com/bartreardon/swiftDialog
+# - Installomator:   https://github.com/Installomator/Installomator
+# this script will install both if they are not yet present
+
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# MARK: Variables
+
+# set to 1 to not require root and not actually do any changes
+# set to 0 for production
+if [[ $1 == "NODEBUG" ]]; then
+    DEBUG=0
+else
+    DEBUG=1
+fi
+
+# the label to install:
+label="googlechromepkg"
+
+
+# MARK: Constants
+
+scriptDir=$(dirname ${0:A})
+repoDir=$(dirname $scriptDir)
+
+# if [[ $DEBUG -eq 1 ]]; then
+    installomator="$repoDir/utils/assemble.sh"
+# else
+#     installomator="/usr/local/Installomator/Installomator.sh"
+# fi
+
+dialog="/usr/local/bin/dialog"
+
+if [[ DEBUG -eq 0 ]]; then
+    dialog_command_file="/var/tmp/dialog.log"
+else
+    dialog_command_file="$HOME/dialog.log"
+fi
+
+
+# MARK: Functions
+
+dialogUpdate() {
+    # $1: dialog command
+    local dcommand=$1
+
+    if [[ -n $dialog_command_file ]]; then
+        echo "$dcommand" >> $dialog_command_file
+        echo "Dialog: $dcommand"
+    fi
+}
+
+progressUpdate() {
+    # $1: progress text (optional)
+    local text=$1
+    itemCounter=$((itemCounter + 1))
+    dialogUpdate "progress: $itemCounter"
+    if [[ -n $text ]]; then
+        dialogUpdate "progresstext: $text"
+    fi
+}
+
+startItem() {
+    local description=$1
+
+    echo "Starting Item: $description"
+    dialogUpdate "listitem: $description: wait"
+    progressUpdate $description
+}
+
+cleanupAndExit() {
+    # kill caffeinate process
+    if [[ -n $caffeinatePID ]]; then
+        echo "killing caffeinate..."
+        kill $caffeinatePID
+    fi
+
+    # clean up tmp dir
+    if [[ -n $tmpDir && -d $tmpDir ]]; then
+        echo "removing tmpDir $tmpDir"
+        rm -rf $tmpDir
+    fi
+}
+
+# MARK: sanity checks
+
+# check minimal macOS requirement
+if [[ $(sw_vers -buildVersion ) < "20" ]]; then
+    echo "This script requires at least macOS 11 Big Sur."
+    exit 98
+fi
+
+# check we are running as root
+if [[ $DEBUG -eq 0 && $(id -u) -ne 0 ]]; then
+    echo "This script should be run as root"
+    exit 97
+fi
+
+# check for installomator
+if [[ ! -x $installomator ]]; then
+    echo "Cannot find Installomator at $installomator"
+    exit 96
+fi
+
+# check for Swift Dialog
+if [[ ! -x $dialog ]]; then
+    echo "Cannot find dialog at $dialog"
+    exit 95
+fi
+
+
+# MARK: Setup
+
+# No sleeping
+caffeinate -dimsu & caffeinatePID=$!
+
+# trap exit for cleanup
+trap cleanupAndExit EXIT
+
+# display first screen
+$dialog --title "Installing $label" \
+        --message "" \
+        --hideicon \
+        --mini \
+        --progress 100 \
+        --position bottomright \
+        --ontop \
+        --movable \
+        --commandfile $dialog_command_file & dialogPID=$!
+
+sleep 0.1
+
+$installomator $label \
+               DIALOG_CMD_FILE="$dialog_command_file" \
+               DEBUG=$DEBUG
+
+# clean up UI
+
+dialogUpdate "progress: complete"
+dialogUpdate "progresstext: Done"
+
+sleep 0.5
+
+dialogUpdate "quit:"
+

MDM/swiftdialog_list.sh

@@ -0,0 +1,185 @@
+#!/bin/zsh
+
+# runs through a list of Installomator items
+# and displays status using Swift Dialog
+#
+# dependencies:
+# - Swift Dialog:    https://github.com/bartreardon/swiftDialog
+# - Installomator:   https://github.com/Installomator/Installomator
+# this script will install both if they are not yet present
+
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
+
+# MARK: Variables
+
+# set to 1 to not require root and not actually do any changes
+# set to 0 for production
+if [[ $1 == "NODEBUG" ]]; then
+    DEBUG=0
+else
+    DEBUG=1
+fi
+
+# list of Installomator labels
+
+items=(
+    "firefoxpkg|Firefox"
+    "error|Expected Error"
+    "googlechromepkg|Google Chrome"
+ )
+
+# MARK: Constants
+
+scriptDir=$(dirname ${0:A})
+repoDir=$(dirname $scriptDir)
+
+# if [[ $DEBUG -eq 1 ]]; then
+    installomator="$repoDir/utils/assemble.sh"
+# else
+#     installomator="/usr/local/Installomator/Installomator.sh"
+# fi
+
+dialog="/usr/local/bin/dialog"
+
+if [[ DEBUG -eq 0 ]]; then
+    dialog_command_file="/var/tmp/dialog.log"
+else
+    dialog_command_file="$HOME/dialog.log"
+fi
+
+
+# MARK: Functions
+
+dialogUpdate() {
+    # $1: dialog command
+    local dcommand=$1
+
+    if [[ -n $dialog_command_file ]]; then
+        echo "$dcommand" >> $dialog_command_file
+        echo "Dialog: $dcommand"
+    fi
+}
+
+progressUpdate() {
+    # $1: progress text (optional)
+    local text=$1
+    itemCounter=$((itemCounter + 1))
+    dialogUpdate "progress: $itemCounter"
+    if [[ -n $text ]]; then
+        dialogUpdate "progresstext: $text"
+    fi
+}
+
+startItem() {
+    local description=$1
+
+    echo "Starting Item: $description"
+    dialogUpdate "listitem: $description: wait"
+    progressUpdate $description
+}
+
+installomator() {
+    # $1: label
+    # $2: description
+    local label=$1
+    local description=$2
+
+    $installomator $label \
+                   DIALOG_CMD_FILE=${(q)dialog_command_file} \
+                   DIALOG_LIST_ITEM_NAME=${(q)description} \
+                   DEBUG=$DEBUG \
+                   LOGGING=DEBUG
+}
+
+cleanupAndExit() {
+    # kill caffeinate process
+    if [[ -n $caffeinatePID ]]; then
+        echo "killing caffeinate..."
+        kill $caffeinatePID
+    fi
+
+    # clean up tmp dir
+    if [[ -n $tmpDir && -d $tmpDir ]]; then
+        echo "removing tmpDir $tmpDir"
+        rm -rf $tmpDir
+    fi
+}
+
+# MARK: sanity checks
+
+# check minimal macOS requirement
+if [[ $(sw_vers -buildVersion ) < "20" ]]; then
+    echo "This script requires at least macOS 11 Big Sur."
+    exit 98
+fi
+
+# check we are running as root
+if [[ $DEBUG -eq 0 && $(id -u) -ne 0 ]]; then
+    echo "This script should be run as root"
+    exit 97
+fi
+
+# check for installomator
+if [[ ! -x $installomator ]]; then
+    echo "Cannot find Installomator at $installomator"
+    exit 96
+fi
+
+# check for Swift Dialog
+if [[ ! -x $dialog ]]; then
+    echo "Cannot find dialog at $dialog"
+    exit 95
+fi
+
+
+# MARK: Setup
+
+# No sleeping
+caffeinate -dimsu & caffeinatePID=$!
+
+# trap exit for cleanup
+trap cleanupAndExit EXIT
+
+# setup first list
+itemCount=$((${#items} + 1))
+
+listitems=( )
+
+for item in $items; do
+    label=$(cut -d '|' -f 1 <<< $item)
+    description=$(cut -d '|' -f 2 <<< $item)
+    listitems+=( "--listitem" ${description} )
+done
+
+# display first screen
+$dialog --title "More Software" \
+        --icon "SF=gear" \
+        --message "We are downloading and installing some extra Apps..." \
+        --progress $itemCount \
+        "${listitems[@]}" \
+        --button1disabled \
+        --big \
+        --ontop \
+        --liststyle compact \
+        --width 700 \
+        --commandfile $dialog_command_file & dialogPID=$!
+sleep 0.1
+
+itemCounter=0
+
+for item in $items; do
+    label=$(cut -d '|' -f 1 <<< $item)
+    description=$(cut -d '|' -f 2 <<< $item)
+
+    startItem $description
+    installomator $label $description
+done
+
+# clean up UI
+
+dialogUpdate "progress: complete"
+dialogUpdate "progresstext: Finished"
+
+dialogUpdate "button1: enable"
+dialogUpdate "button1text: Done"
+

fragments/arguments.sh

@@ -7,6 +7,7 @@ if ! is-at-least 10.14 $installedOSversion; then
     exit 98
 fi
 
+
 # MARK: argument parsing
 if [[ $# -eq 0 ]]; then
     if [[ -z $label ]]; then # check if label is set inside script
@@ -24,7 +25,7 @@ fi
 while [[ -n $1 ]]; do
     if [[ $1 =~ ".*\=.*" ]]; then
         # if an argument contains an = character, send it to eval
-        printlog "setting variable from argument $1" WARN
+        printlog "setting variable from argument $1" INFO
         eval $1
     else
         # assume it's a label
@@ -99,6 +100,16 @@ if [[ "$(whoami)" != "root" && "$DEBUG" -eq 0 ]]; then
     cleanupAndExit 6 "not running as root, exiting" ERROR
 fi
 
+
+# check Swift Dialog presence and version
+DIALOG_CMD="/usr/local/bin/dialog"
+
+if [[ ! -x $DIALOG_CMD ]]; then
+    # Swift Dialog is not installed, clear cmd file variable to ignore
+    printlog "SwiftDialog is not installed, clear cmd file var"
+    DIALOG_CMD_FILE=""
+fi
+
 # MARK: labels in case statement
 case $label in
 longversion)

fragments/disabled/wickrme.sh

@@ -1,6 +1,7 @@
 wickrme)
-    # credit: Søren Theilgaard (@theilgaard)
+    # Label  not working, haven't found a solution
     name="WickrMe"
+    printlog "Label for $name broken in test" WARN
     type="dmg"
     downloadURL=$( curl -fs https://me-download.wickr.com/api/download/me/download/mac | tr '"' '\n' | grep -e '^https://' )
     appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )

fragments/disabled/wickrpro.sh

@@ -1,6 +1,7 @@
 wickrpro)
-    # credit: Søren Theilgaard (@theilgaard)
+    # Label  not working, haven't found a solution
     name="WickrPro"
+    printlog "Label for $name broken in test" WARN
     type="dmg"
     downloadURL=$( curl -fs https://me-download.wickr.com/api/download/pro/download/mac | tr '"' '\n' | grep -e '^https://' )
     appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )

fragments/functions.sh

@@ -14,15 +14,18 @@ cleanupAndExit() { # $1 = exit code, $2 message, $3 level
         printlog "Debugging enabled, Deleting tmpDir output was:\n$deleteTmpOut" DEBUG
     fi
 
+
     # If we closed any processes, reopen the app again
     reopenClosedProcess
     if [[ -n $2 && $1 -ne 0 ]]; then
         printlog "ERROR: $2" $3
+        updateDialog "fail" "Error ($1; $2)"
     else
         printlog "$2" $3
+        updateDialog "success" ""
     fi
     printlog "################## End Installomator, exit code $1 \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
@@ -61,9 +64,12 @@ displaynotification() { # $1: message $2: title
     message=${1:-"Message"}
     title=${2:-"Notification"}
     manageaction="/Library/Application Support/JAMF/bin/Management Action.app/Contents/MacOS/Management Action"
+    hubcli="/usr/local/bin/hubcli"
 
     if [[ -x "$manageaction" ]]; then
          "$manageaction" -message "$message" -title "$title"
+    elif [[ -x "$hubcli" ]]; then
+         "$hubcli" notify -t "$title" -i "$message" -c "Dismiss"
     else
         runAsUser osascript -e "display notification \"$message\" with title \"$title\""
     fi
@@ -156,14 +162,14 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
     fi
 
     if [ -n "$archiveName" ]; then
-    downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
-    | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }")
+        #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }")
+        downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*$archiveName" | head -1)
     else
-    downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" \
-    | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+        #downloadURL=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+        downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)
     fi
     if [ -z "$downloadURL" ]; then
-        cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame" ERROR
+        cleanupAndExit 14 "could not retrieve download URL for $gitusername/$gitreponame" ERROR
     else
         echo "$downloadURL"
         return 0
@@ -176,7 +182,8 @@ versionFromGit() {
     gitusername=${1?:"no git user name"}
     gitreponame=${2?:"no git repo name"}
 
-    appNewVersion=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | grep tag_name | cut -d '"' -f 4 | sed 's/[^0-9\.]//g')
+    #appNewVersion=$(curl -L --silent --fail "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | grep tag_name | cut -d '"' -f 4 | sed 's/[^0-9\.]//g')
+    appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
     if [ -z "$appNewVersion" ]; then
         printlog "could not retrieve version number for $gitusername/$gitreponame" WARN
         appNewVersion=""
@@ -199,6 +206,16 @@ xpath() {
 	fi
 }
 
+# from @Pico: https://macadmins.slack.com/archives/CGXNNJXJ9/p1652222365989229?thread_ts=1651786411.413349&cid=CGXNNJXJ9
+getJSONValue() {
+	# $1: JSON string OR file path to parse (tested to work with up to 1GB string and 2GB file).
+	# $2: JSON key path to look up (using dot or bracket notation).
+	printf '%s' "$1" | /usr/bin/osascript -l 'JavaScript' \
+		-e "let json = $.NSString.alloc.initWithDataEncoding($.NSFileHandle.fileHandleWithStandardInput.readDataToEndOfFile$(/usr/bin/uname -r | /usr/bin/awk -F '.' '($1 > 18) { print "AndReturnError(ObjC.wrap())" }'), $.NSUTF8StringEncoding)" \
+		-e 'if ($.NSFileManager.defaultManager.fileExistsAtPath(json)) json = $.NSString.stringWithContentsOfFileEncodingError(json, $.NSUTF8StringEncoding, ObjC.wrap())' \
+		-e "const value = JSON.parse(json.js)$([ -n "${2%%[.[]*}" ] && echo '.')$2" \
+		-e 'if (typeof value === "object") { JSON.stringify(value, null, 4) } else { value }'
+}
 
 getAppVersion() {
     # modified by: Søren Theilgaard (@theilgaard) and Isaac Ordonez
@@ -268,7 +285,7 @@ getAppVersion() {
                     printlog "Replacing App Store apps, no matter the version" WARN
                     appversion=0
                 else
-                    cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR
+                    cleanupAndExit 23 "App previously installed from App Store, and we respect that" ERROR
                 fi
             fi
         else
@@ -417,6 +434,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
 
     # verify with spctl
     printlog "Verifying: $appPath" INFO
+    updateDialog "wait" "Verifying..."
     printlog "App size: $(du -sh "$appPath")" DEBUG
     appVerify=$(spctl -a -vv "$appPath" 2>&1 )
     appVerifyStatus=$(echo $?)
@@ -465,7 +483,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
                 printlog "notifying"
                 displaynotification "$message" "Error updating $name!"
             fi
-            cleanupAndExit 6 "Installed macOS is too old for this app." ERROR
+            cleanupAndExit 15 "Installed macOS is too old for this app." ERROR
         fi
     fi
 
@@ -524,7 +542,7 @@ installAppWithPath() { # $1: path to app to install in $targetDir
         deduplicatelogs "$CLIoutput"
 
         if [ $CLIstatus -ne 0 ] ; then
-            cleanupAndExit 3 "Error installing $mountname/$CLIInstaller $CLIArguments error:\n$logoutput" ERROR
+            cleanupAndExit 16 "Error installing $mountname/$CLIInstaller $CLIArguments error:\n$logoutput" ERROR
         else
             printlog "Succesfully ran $mountname/$CLIInstaller $CLIArguments" INFO
         fi
@@ -562,6 +580,7 @@ installFromDMG() {
 installFromPKG() {
     # verify with spctl
     printlog "Verifying: $archiveName"
+    updateDialog "wait" "Verifying..."
     printlog "File list: $(ls -lh "$archiveName")" DEBUG
     printlog "File type: $(file "$archiveName")" DEBUG
     spctlOut=$(spctl -a -vv -t install "$archiveName" 2>&1 )
@@ -629,8 +648,29 @@ installFromPKG() {
 
     # install pkg
     printlog "Installing $archiveName to $targetDir"
-    pkgInstall=$(installer -verbose -dumplog -pkg "$archiveName" -tgt "$targetDir" 2>&1)
-    pkgInstallStatus=$(echo $?)
+
+    if [[ $DIALOG_CMD_FILE != "" ]]; then
+        # pipe
+        pipe="$tmpDir/installpipe"
+        # initialise named pipe for installer output
+        initNamedPipe create $pipe
+
+        # run the pipe read in the background
+        readPKGInstallPipe $pipe "$DIALOG_CMD_FILE" & installPipePID=$!
+        printlog "listening to output of installer with pipe $pipe and command file $DIALOG_CMD_FILE on PID $installPipePID" DEBUG
+
+        pkgInstall=$(installer -verboseR -pkg "$archiveName" -tgt "$targetDir" 2>&1 | tee $pipe)
+        pkgInstallStatus=$pipestatus[1]
+            # because we are tee-ing the output, we want the pipe status of the first command in the chain, not the most recent one
+        killProcess $installPipePID
+
+    else
+        pkgInstall=$(installer -verbose -dumplog -pkg "$archiveName" -tgt "$targetDir" 2>&1)
+        pkgInstallStatus=$(echo $?)
+    fi
+
+
+
     sleep 1
     pkgEndTime=$(date "+$LogDateFormat")
     pkgInstall+=$(echo "\nOutput of /var/log/install.log below this line.\n")
@@ -722,7 +762,7 @@ installPkgInZip() {
         printlog "Found pkg(s):\n$findfiles" DEBUG
         filearray=( ${(f)findfiles} )
         if [[ ${#filearray} -eq 0 ]]; then
-            cleanupAndExit 20 "couldn't find pkg in zip $archiveName" ERROR
+            cleanupAndExit 21 "couldn't find pkg in zip $archiveName" ERROR
         fi
         # it is now safe to overwrite archiveName for installFromPKG
         archiveName="${filearray[1]}"
@@ -735,7 +775,7 @@ installPkgInZip() {
             findfiles=$(find "$tmpDir" -iname "$pkgName")
             filearray=( ${(f)findfiles} )
             if [[ ${#filearray} -eq 0 ]]; then
-                cleanupAndExit 20 "couldn't find pkg “$pkgName” in zip $archiveName" ERROR
+                cleanupAndExit 21 "couldn't find pkg “$pkgName” in zip $archiveName" ERROR
             fi
             # it is now safe to overwrite archiveName for installFromPKG
             archiveName="${filearray[1]}"
@@ -758,7 +798,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" ERROR
+            cleanupAndExit 22 "couldn't find dmg in zip $archiveName" ERROR
         fi
         archiveName="$(basename ${filearray[1]})"
         # it is now safe to overwrite archiveName for installFromDMG
@@ -810,7 +850,8 @@ runUpdateTool() {
 
 finishing() {
     printlog "Finishing..."
-    sleep 10 # wait a moment to let spotlight catch up
+
+    sleep 3 # wait a moment to let spotlight catch up
     getAppVersion
 
     if [[ -z $appversion ]]; then
@@ -858,3 +899,113 @@ hasDisplaySleepAssertion() {
     return 1
 }
 
+initNamedPipe() {
+    # create or delete a named pipe
+    # commands are "create" or "delete"
+
+    local cmd=$1
+    local pipe=$2
+    case $cmd in
+        "create")
+            if [[ -e $pipe ]]; then
+                rm $pipe
+            fi
+            # make named pipe
+            mkfifo -m 644 $pipe
+            ;;
+        "delete")
+            # clean up
+            rm $pipe
+            ;;
+        *)
+            ;;
+    esac
+}
+
+readDownloadPipe() {
+    # reads from a previously created named pipe
+    # output from curl with --progress-bar. % downloaded is read in and then sent to the specified log file
+    local pipe=$1
+    local log=${2:-$DIALOG_CMD_FILE}
+    # set up read from pipe
+    while IFS= read -k 1 -u 0 char; do
+        if [[ $char =~ [0-9] ]]; then
+            keep=1
+        fi
+
+        if [[ $char == % ]]; then
+            updateDialog $progress "Downloading..."
+            progress=""
+            keep=0
+        fi
+
+        if [[ $keep == 1 ]]; then
+            progress="$progress$char"
+        fi
+    done < $pipe
+}
+
+readPKGInstallPipe() {
+    # reads from a previously created named pipe
+    # output from installer with -verboseR. % install status is read in and then sent to the specified log file
+    local pipe=$1
+    local log=${2:-$DIALOG_CMD_FILE}
+    local appname=${3:-$name}
+
+    while read -k 1 -u 0 char; do
+        if [[ $char == % ]]; then
+            keep=1
+        fi
+        if [[ $char =~ [0-9] && $keep == 1 ]]; then
+            progress="$progress$char"
+        fi
+        if [[ $char == . && $keep == 1 ]]; then
+            updateDialog $progress "Installing..."
+            progress=""
+            keep=0
+        fi
+    done < $pipe
+}
+
+killProcess() {
+    # will silently kill the specified PID
+    builtin kill $1 2>/dev/null
+}
+
+updateDialog() {
+    local state=$1
+    local message=$2
+    local listitem=${3:-$DIALOG_LIST_ITEM_NAME}
+    local cmd_file=${4:-$DIALOG_CMD_FILE}
+    local progress=""
+
+    if [[ $state =~ '^[0-9]' \
+       || $state == "reset" \
+       || $state == "increment" \
+       || $state == "complete" \
+       || $state == "indeterminate" ]]; then
+        progress=$state
+    fi
+
+    # when to cmdfile is set, do nothing
+    if [[ $cmd_file == "" ]]; then
+        return
+    fi
+
+    if [[ $listitem == "" ]]; then
+        # no listitem set, update main progress bar and progress text
+        if [[ $progress != "" ]]; then
+            echo "progress: $progress" >> $cmd_file
+        fi
+        if [[ $message != "" ]]; then
+            echo "progresstext: $name - $message" >> $cmd_file
+        fi
+    else
+        # list item has a value, so we update the progress and text in the list
+        if [[ $progress != "" ]]; then
+            echo "listitem: title: $listitem, statustext: $message, progress: $progress" >> $cmd_file
+        else
+            echo "listitem: title: $listitem, statustext: $message, status: $state" >> $cmd_file
+        fi
+    fi
+}

fragments/header.sh

@@ -7,7 +7,7 @@ label="" # if no label is sent to the script, this will be used
 # 2020-2021 Installomator
 #
 # inspired by the download scripts from William Smith and Sander Schram
-# 
+#
 # Contributers:
 #    Armin Briegel - @scriptingosx
 #    Isaac Ordonez - @issacatmann
@@ -23,7 +23,7 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 # 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 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
 
@@ -34,7 +34,6 @@ NOTIFY=success
 #   - silent       no notifications
 #   - all          all notifications (great for Self Service installation)
 
-
 # behavior when blocking processes are found
 BLOCKING_PROCESS_ACTION=tell_user
 # options:
@@ -81,6 +80,7 @@ LOGO=appstore
 #   - mosylem       Mosyle Manager (Education)
 #   - addigy        Addigy
 #   - microsoft     Microsoft Endpoint Manager (Intune)
+#   - ws1           Workspace ONE (AirWatch)
 # path can also be set in the command call, and if file exists, it will be used.
 # Like 'LOGO="/System/Applications/App\ Store.app/Contents/Resources/AppIcon.icns"'
 # (spaces have to be escaped).
@@ -139,6 +139,26 @@ IGNORE_DND_APPS=""
 # IGNORE_DND_APPS="firefox,Google Chrome,Safari,Microsoft Edge,Opera,Amphetamine,caffeinate"
 
 
+# Swift Dialog integration
+
+# These variables will allow Installomator to communicate progress with Swift Dialog
+# https://github.com/bartreardon/swiftDialog
+
+# This requires Swift Dialog 2.11.2 or higher.
+
+DIALOG_CMD_FILE=""
+# When this variable is set, Installomator will write Swift Dialog commands to this path.
+# Installomator will not launch Swift Dialog. The process calling Installomator will have
+# launch and configure Swift Dialog to listen to this file.
+# See `MDM/swiftdialog_example.sh` for an example.
+
+DIALOG_LIST_ITEM_NAME=""
+# When this variable is set, progress for downloads and installs will be sent to this
+# listitem.
+# When the variable is unset, progress will be sent to Swift Dialog's main progress bar.
+
+
+
 # NOTE: How labels work
 
 # Each workflow label needs to be listed in the case statement below.
@@ -184,7 +204,7 @@ IGNORE_DND_APPS=""
 #   How we get version number from app. Possible values:
 #     - CFBundleShortVersionString
 #     - CFBundleVersion
-#   Not all software titles uses fields the same. 
+#   Not all software titles uses fields the same.
 #   See Opera label.
 #
 # - appCustomVersion(){}: (optional function)

fragments/labels/abetterfinderrename11.sh

@@ -0,0 +1,7 @@
+abetterfinderrename11)
+    name="A Better Finder Rename 11"
+    type="dmg"
+    downloadURL="https://www.publicspace.net/download/ABFRX11.dmg"
+    appNewVersion=$(curl -fs "https://www.publicspace.net/app/signed_abfr11.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:version)' 2>/dev/null | cut -d '"' -f 2)
+    expectedTeamID="7Y9KW4ND8W"
+    ;;

fragments/labels/acroniscyberprotectconnect.sh

@@ -0,0 +1,9 @@
+acroniscyberprotectconnect|\
+remotix)
+    name="Acronis Cyber Protect Connect"
+    type="dmg"
+    downloadURL="https://go.acronis.com/AcronisCyberProtectConnect_ForMac"
+    versionKey="CFBundleVersion"
+    appNewVersion=$(curl -fsIL "${downloadURL}" | grep -i "^location" | sed -E 's/.*\/[a-zA-Z]*-[0-9.]*-([0-9.]*)\.dmg/\1/g')
+    expectedTeamID="ZU2TV78AA6"
+    ;;

fragments/labels/acroniscyberprotectconnectagent.sh

@@ -0,0 +1,10 @@
+acroniscyberprotectconnectagent|\
+remotixagent)
+    name="Acronis Cyber Protect Connect Agent"
+    type="pkg"
+    #packageID="com.nulana.rxagentmac"
+    downloadURL="https://go.acronis.com/AcronisCyberProtectConnect_AgentForMac"
+    versionKey="CFBundleVersion"
+    appNewVersion=$(curl -fsIL "${downloadURL}" | grep -i "^location" | sed -E 's/.*\/[a-zA-Z]*-[0-9.]*-([0-9.]*)\.pkg/\1/g')
+    expectedTeamID="H629V387SY"
+    ;;

fragments/labels/adobecreativeclouddesktop.sh

@@ -2,10 +2,11 @@ adobecreativeclouddesktop)
     name="Adobe Creative Cloud"
     #appName="Install.app"
     type="dmg"
+    adobeurl="https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html"
     if [[ $(arch) == "arm64" ]]; then
-        downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*macarm64.*dmg" | cut -d '"' -f1 | head -1)
+        downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'osx10')][contains(text(),'Download')]/@href)" - 2> /dev/null)
     elif [[ $(arch) == "i386" ]]; then
-        downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*osx10.*dmg" | cut -d '"' -f1 | head -1)
+        downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'macarm64')][contains(text(),'Download')]/@href)" - 2> /dev/null)
     fi
     #downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*dmg" | head -1)
     appNewVersion=$(curl -fs "https://helpx.adobe.com/creative-cloud/release-note/cc-release-notes.html" | grep "mandatory" | head -1 | grep -o "Version *.* released" | cut -d " " -f2)

fragments/labels/awsvpnclient.sh

@@ -3,5 +3,5 @@ awsvpnclient)
     type="pkg"
     downloadURL="https://d20adtppz83p9s.cloudfront.net/OSX/latest/AWS_VPN_Client.pkg"
     expectedTeamID="94KV3E626L"
-    appNewVersion=$(curl -is "https://beta2.communitypatch.com/jamf/v1/ba1efae22ae74a9eb4e915c31fef5dd2/patch/AWSVPNClient" | grep currentVersion | tr ',' '\n' | grep currentVersion | cut -d '"' -f 4)
+    #appNewVersion=$(curl -is "https://beta2.communitypatch.com/jamf/v1/ba1efae22ae74a9eb4e915c31fef5dd2/patch/AWSVPNClient" | grep currentVersion | tr ',' '\n' | grep currentVersion | cut -d '"' -f 4)
     ;;

fragments/labels/blender.sh

@@ -1,7 +1,11 @@
 blender)
     name="blender"
     type="dmg"
-    downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep -m1 .dmg)
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL=$(curl -sfL "https://www.blender.org/download/" | xmllint --html --format - 2>/dev/null | grep -o "https://.*blender.*arm64.*.dmg" | sed '2p;d' | sed 's/www.blender.org\/download/download.blender.org/g')
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL=$(curl -sfL "https://www.blender.org/download/" | xmllint --html --format - 2>/dev/null | grep -o "https://.*blender.*x64.*.dmg" | sed '2p;d' | sed 's/www.blender.org\/download/download.blender.org/g')
+    fi
     appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
     expectedTeamID="68UA947AUU"
     ;;

fragments/labels/bluejeanswithaudiodriver.sh

@@ -0,0 +1,12 @@
+bluejeanswithaudiodriver)
+    name="BlueJeans"
+    type="pkg"
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeans.*Installer.*arm.*.pkg" )
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.*x86.*.dmg" | sed 's/dmg/pkg/g')
+    fi
+    appNewVersion=$(echo $downloadURL | cut -d '/' -f6)
+    choiceChangesXML='<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><array><dict><key>attributeSetting</key><integer>1</integer><key>choiceAttribute</key><string>selected</string><key>choiceIdentifier</key><string>com.tatvikmohit.BlueJeans-Audio</string></dict></array></plist>'
+    expectedTeamID="HE4P42JBGN"
+    ;;

fragments/labels/boxtools.sh

@@ -2,5 +2,6 @@ boxtools)
     name="Box Tools"
     type="pkg"
     downloadURL="https://box-installers.s3.amazonaws.com/boxedit/mac/currentrelease/BoxToolsInstaller.pkg"
+    packageID="com.box.boxtools.installer.boxedit"
     expectedTeamID="M683GB7CPW"
     ;;

fragments/labels/camtasia2019.sh

@@ -5,4 +5,3 @@ camtasia2019)
     appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2019" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
     expectedTeamID="7TQL462TU8"
     ;;
-    

fragments/labels/carboncopycloner.sh

@@ -0,0 +1,7 @@
+carboncopycloner)
+    name="Carbon Copy Cloner"
+    type="zip"
+    downloadURL=$(curl -fsIL "https://bombich.com/software/download_ccc.php?v=latest" | grep -i ^location | sed -E 's/.*(https.*\.zip).*/\1/g')
+    appNewVersion=$(sed -E 's/.*-([0-9.]*)\.zip/\1/g' <<< $downloadURL | sed 's/\.[^.]*$//')
+    expectedTeamID="L4F2DED5Q7"
+    ;;

fragments/labels/clevershare2.sh

@@ -1,7 +1,8 @@
 clevershare2)
     name="Clevershare"
     type="dmg"
-    downloadURL=$(curl -fs https://www.clevertouch.com/eu/clevershare2g | grep -i -o -E "https.*Mac.*\.dmg")
-    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z-]*_Mac\.([0-9.]*)\.[0-9]*\.dmg$/\1/g' )
+    printlog "Label for $name broken in test" ERROR
+    downloadURL=$(curl -fs https://www.clevertouch.com/eu/clevershare2g | grep -i -o -E "https.*notarized.*\.dmg")
+    appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/([0-9.]*)\/[0-9]*\/.*\.dmg$/\1/')
     expectedTeamID="P76M9BE8DQ"
     ;;

fragments/labels/clickshare.sh

@@ -1,7 +1,7 @@
 clickshare)
-    # credit: Søren Theilgaard (@theilgaard)
     name="ClickShare"
     type="appInDmgInZip"
-    downloadURL=https://www.barco.com$(curl -fs "https://www.barco.com/en/clickshare/app" | grep -E -o '(\/\S*Download\?FileNumber=R3306192\S*ShowDownloadPage=False)' | tail -1)
+    downloadURL="https://www.barco.com$( curl -fs "https://www.barco.com/en/clickshare/app" | grep -A6 -i "macos" | grep -i "FileNumber" | tr '"' "\n" | grep -i "FileNumber" )"
+    appNewVersion="$(eval "$( echo $downloadURL | sed -E 's/.*(MajorVersion.*BuildVersion=[0-9]*).*/\1/' | sed 's/&amp//g' )" ; ((MajorVersion++)) ; ((MajorVersion--)); ((MinorVersion++)) ; ((MinorVersion--)); ((PatchVersion++)) ; ((PatchVersion--)); ((BuildVersion++)) ; ((BuildVersion--)); echo "${MajorVersion}.${MinorVersion}.${PatchVersion}-b${BuildVersion}")"
     expectedTeamID="P6CDJZR997"
     ;;

fragments/labels/cocoapods.sh

@@ -0,0 +1,7 @@
+cocoapods)
+    name="CocoaPods"
+    type="bz2"
+    downloadURL="$(downloadURLFromGit CocoaPods CocoaPods-app)"
+    appNewVersion="$(versionFromGit CocoaPods CocoaPods-app)"
+    expectedTeamID="AX2Q2BH2XR"
+    ;;

fragments/labels/coconutbattery.sh

@@ -0,0 +1,7 @@
+coconutbattery)
+    name="coconutBattery"
+    type="zip"
+    downloadURL="https://coconut-flavour.com/downloads/coconutBattery_latest.zip"
+    appNewVersion=$(curl -fs https://www.coconut-flavour.com/coconutbattery/ | grep "<title>" | sed -e  's/.*coconutBattery \(.*\) - by coconut-flavour.co.*/\1/')
+    expectedTeamID="R5SC3K86L5"
+    ;;

fragments/labels/coderunner.sh

@@ -1,7 +1,7 @@
 coderunner)
-    # credit: Erik Stam (@erikstam)
     name="CodeRunner"
     type="zip"
     downloadURL="https://coderunnerapp.com/download"
+    appNewVersion=$(curl -fsIL ${downloadURL} | grep -i "^location" | cut -d " " -f2 | sed -E 's/.*CodeRunner-([0-9.]*).zip/\1/')
     expectedTeamID="R4GD98AJF9"
     ;;

fragments/labels/colourcontrastanalyser.sh

@@ -1,5 +1,5 @@
 colourcontrastanalyser)
-    name="Colour Contrast Analyser (CCA)"
+    name="Colour Contrast Analyser"
     type="dmg"
     downloadURL=$(downloadURLFromGit ThePacielloGroup CCAe)
     appNewVersion=$(versionFromGit ThePacielloGroup CCAe)

fragments/labels/cricutdesignspace.sh

@@ -0,0 +1,7 @@
+cricutdesignspace)
+    name="Cricut Design Space"
+    type="dmg"
+    appNewVersion=$(getJSONValue "$(curl -fsL https://s3-us-west-2.amazonaws.com/staticcontent.cricut.com/a/software/osx-native/latest.json)" "rolloutVersion")
+    downloadURL=$(getJSONValue $(curl  -fsL "https://apis.cricut.com/desktopdownload/InstallerFile?shard=a&operatingSystem=osxnative&fileName=CricutDesignSpace-Install-v${appNewVersion}.dmg") "result")
+    expectedTeamID="25627ZFVT7"
+    ;;

fragments/labels/cryptomator.sh

@@ -1,6 +1,12 @@
 cryptomator)
     name="Cryptomator"
     type="dmg"
+    if [[ $(arch) == "arm64" ]]; then
+        archiveName="Cryptomator-[0-9.]*-arm64.dmg"
+
+    elif [[ $(arch) == "i386" ]]; then
+        archiveName="Cryptomator-[0-9.]*.dmg"
+    fi
     downloadURL=$(downloadURLFromGit cryptomator cryptomator)
     appNewVersion=$(versionFromGit cryptomator cryptomator)
     expectedTeamID="YZQJQUHA3L"

fragments/labels/dangerzone.sh

@@ -1,7 +1,7 @@
 dangerzone)
     name="Dangerzone"
     type="dmg"
-    downloadURL="$(downloadURLFromGit firstlookmedia dangerzone)"
-    appNewVersion="$(versionFromGit firstlookmedia dangerzone)"
+    downloadURL="$(downloadURLFromGit freedomofpress dangerzone)"
+    appNewVersion="$(versionFromGit freedomofpress dangerzone)"
     expectedTeamID="N9B95FDWH4"
     ;;

fragments/labels/drawio.sh

@@ -1,7 +1,7 @@
 drawio)
     name="draw.io"
     type="dmg"
-    archiveName="draw.io-universal-[0-9.]*.dmg"
+    archiveName="draw.io-universal-[0-9.]*.dmg$"
     downloadURL="$(downloadURLFromGit jgraph drawio-desktop)"
     appNewVersion="$(versionFromGit jgraph drawio-desktop)"
     expectedTeamID="UZEUFB4N53"

fragments/labels/duodevicehealth.sh

@@ -0,0 +1,9 @@
+duodevicehealth)
+    name="Duo Device Health"
+    type="pkgInDmg"
+    downloadURL="https://dl.duosecurity.com/DuoDeviceHealth-latest.dmg"
+    appNewVersion=$(curl -fsLIXGET "https://dl.duosecurity.com/DuoDeviceHealth-latest.dmg" | grep -i "^content-disposition" | sed -e 's/.*filename\=\"DuoDeviceHealth\-\(.*\)\.dmg\".*/\1/')
+    appName="Duo Device Health.app"
+    expectedTeamID="FNN8Z5JMFP"
+    ;;
+

fragments/labels/dynalist.sh

@@ -0,0 +1,7 @@
+dynalist)
+    name="Dynalist"
+    type="dmg"
+    downloadURL="https://dynalist.io/standalone/download?file=Dynalist.dmg"
+    appNewVersion=""
+    expectedTeamID="6JSW4SJWN9"
+    ;;

fragments/labels/egnyte.sh

@@ -3,6 +3,7 @@ egnyte)
     name="Egnyte Connect"
     type="pkg"
     downloadURL="https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/latest/EgnyteConnectMac.pkg"
+    appNewVersion=$(curl -fs "https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/versions/default.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' | cut -d '"' -f 2)
     expectedTeamID="FELUD555VC"
     blockingProcesses=( NONE )
     ;;

fragments/labels/fellow.sh

@@ -0,0 +1,7 @@
+fellow)
+    name="Fellow"
+    type="dmg"
+    downloadURL="https://cdn.fellow.app/desktop/1.3.11/darwin/stable/universal/Fellow-1.3.11-universal.dmg"
+    appNewVersion=""
+    expectedTeamID="2NF46HY8D8"
+    ;;

fragments/labels/firefox.sh

@@ -2,7 +2,8 @@ firefox)
     name="Firefox"
     type="dmg"
     downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
     printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ

fragments/labels/firefox_da.sh

@@ -2,7 +2,8 @@ firefox_da)
     name="Firefox"
     type="dmg"
     downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=da"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
     printlog "WARNING for ERROR: Label firefox, firefox_da and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ

fragments/labels/firefox_intl.sh

@@ -19,7 +19,8 @@ firefox_intl)
         printlog "Download not found for '$userLanguage', using default ('en-US')."
         downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx"
     fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}')
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
     printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ

fragments/labels/firefoxesr.sh

@@ -3,7 +3,8 @@ firefoxesrpkg)
     name="Firefox"
     type="pkg"
     downloadURL="https://download.mozilla.org/?product=firefox-esr-pkg-latest-ssl&os=osx"
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g')
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "FIREFOX_ESR")
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
     ;;

fragments/labels/firefoxesr_intl.sh

@@ -19,7 +19,8 @@ firefoxesr_intl)
         printlog "Download not found for '$userLanguage', using default ('en-US')."
         downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx"
     fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"esr/"); print a[1]}')
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
     printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ

fragments/labels/firefoxpkg.sh

@@ -2,7 +2,8 @@ firefoxpkg)
     name="Firefox"
     type="pkg"
     downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
     ;;

fragments/labels/firefoxpkg_intl.sh

@@ -18,7 +18,8 @@ firefoxpkg_intl)
         printlog "Download not found for that language. Using en-US" WARN
         downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
     fi
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location | cut -d "/" -f7)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
     ;;

fragments/labels/flexoptixapp.sh

@@ -0,0 +1,7 @@
+flexoptixapp)
+    name="FLEXOPTIX App"
+    type="dmg"
+    downloadURL="https://flexbox.reconfigure.me/download/electron/mac/x64/current"
+    appNewVersion=$(curl -fsIL "${downloadURL}" | grep -i ^location | sed -E 's/.*-([0-9.]*)\.dmg/\1/g')
+    expectedTeamID="C5JETSFPHL"
+    ;;

fragments/labels/golang.sh

@@ -2,7 +2,11 @@ golang)
     name="GoLang"
     type="pkg"
     packageID="org.golang.go"
-    downloadURL="https://go.dev$(curl -fs "https://go.dev/dl/" | grep -i "downloadBox" | grep "pkg" | tr '"' '\n' | grep "pkg")"
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL="https://go.dev$(curl -fs "https://go.dev/dl/" | grep -i "downloadBox" | grep "darwin-arm" | tr '"' '\n' | grep "pkg")"
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL="https://go.dev$(curl -fs "https://go.dev/dl/" | grep -i "downloadBox" | grep "darwin-amd" | tr '"' '\n' | grep "pkg")"
+    fi
     appNewVersion="$( echo "${downloadURL}" | sed -E 's/.*\/(go[0-9.]*)\..*/\1/g' )" # Version includes letters "go" in the beginning
     expectedTeamID="EQHXZ8M8AV"
     blockingProcesses=( NONE )

fragments/labels/googleadseditor.sh

@@ -0,0 +1,7 @@
+googleadseditor)
+    name="Google Ads Editor"
+    type="dmg"
+    downloadURL="https://dl.google.com/adwords_editor/google_ads_editor.dmg"
+    appNewVersion=""
+    expectedTeamID="EQHXZ8M8AV"
+    ;;

fragments/labels/googlechromeenterprise.sh

@@ -0,0 +1,10 @@
+googlechromeenterprise)
+    name="Google Chrome"
+    type="pkg"
+    downloadURL="https://dl.google.com/dl/chrome/mac/universal/stable/gcem/GoogleChrome.pkg"
+    appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
+    expectedTeamID="EQHXZ8M8AV"
+    updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent"
+    updateToolArguments=( -runMode oneshot -userInitiated YES )
+    updateToolRunAsCurrentUser=1
+    ;;

fragments/labels/googledrive.sh

@@ -3,8 +3,13 @@ googledrivefilestream)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
     name="Google Drive File Stream"
     type="pkgInDmg"
-    packageID="com.google.drivefs"
+    if [[ $(arch) == "arm64" ]]; then
+       packageID="com.google.drivefs.arm64"
+    elif [[ $(arch) == "i386" ]]; then
+       packageID="com.google.drivefs.x86_64"
+    fi    
     downloadURL="https://dl.google.com/drive-file-stream/GoogleDriveFileStream.dmg" # downloadURL="https://dl.google.com/drive-file-stream/GoogleDrive.dmg"
     blockingProcesses=( "Google Docs" "Google Drive" "Google Sheets" "Google Slides" )
+    appName="Google Drive.app"
     expectedTeamID="EQHXZ8M8AV"
     ;;

fragments/labels/grammarly.sh

@@ -2,9 +2,8 @@ grammarly)
      name="Grammarly Desktop"
      type="dmg"
      packageID="com.grammarly.ProjectLlama"
-     downloadURL=$(curl -fsL "https://download-mac.grammarly.com/appcast.xml" | xpath '//rss/channel/item[1]/enclosure/@url' 2>/dev/null  | cut -d '"' -f 2)
+     downloadURL="https://download-mac.grammarly.com/Grammarly.dmg"
      expectedTeamID="W8F64X92K3"
-     appNewVersion=$(curl -is "https://download-mac.grammarly.com/appcast.xml" | grep sparkle:version | tr ',' '\n' | grep sparkle:version | cut -d '"' -f 4)
      # appName="Grammarly Installer.app"
      installerTool="Grammarly Installer.app"
      CLIInstaller="Grammarly Installer.app/Contents/MacOS/Grammarly Desktop"

fragments/labels/icons.sh

@@ -1,8 +1,7 @@
 icons)
-    # credit: Mischa van der Bent (@mischavdbent)
     name="Icons"
     type="zip"
-    downloadURL=$(downloadURLFromGit sap macOS-icon-generator )
-    appNewVersion=$(versionFromGit sap macOS-icon-generator )
+    downloadURL=$(downloadURLFromGit SAP macOS-icon-generator )
+    appNewVersion=$(versionFromGit SAP macOS-icon-generator )
     expectedTeamID="7R5ZEU67FQ"
     ;;

fragments/labels/insomnia.sh

@@ -1,7 +1,9 @@
 insomnia)
-    name="insomnia"
+    name="Insomnia"
     type="dmg"
-    downloadURL=$(downloadURLFromGit kong insomnia)
-    appNewVersion=$(versionFromGit kong insomnia)
+    #downloadURL=$(downloadURLFromGit kong insomnia)
+    downloadURL=$(curl -fs "https://updates.insomnia.rest/downloads/mac/latest?app=com.insomnia.app&source=website" | grep -o "https.*\.dmg")
+    #appNewVersion=$(versionFromGit kong insomnia)
+    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\/Insomnia.Core.([0-9.]*)\.dmg/\1/')
     expectedTeamID="FX44YY62GV"
     ;;

fragments/labels/ipswupdater.sh

@@ -0,0 +1,8 @@
+ipswupdater)
+    name="IPSW Updater"
+    type="zip"
+    ipswupdaterVersions=$(curl -fs "https://ipsw.app/download/updates.php?current_version=0.9.16")
+    downloadURL=$(getJSONValue "$ipswupdaterVersions" "[0].url")
+    appNewVersion=$(getJSONValue "$ipswupdaterVersions" "[0].version")
+    expectedTeamID="YRW6NUGA63"
+    ;;

fragments/labels/kap.sh

@@ -0,0 +1,14 @@
+kap)
+    # credit: Lance Stephens (@pythoninthegrass on MacAdmins Slack)
+    name="Kap"
+    type="dmg"
+    if [[ $(arch) = "i386" ]]; then
+        archiveName="${name}-[0-9.]*-x64.${type}"
+        downloadURL=$(downloadURLFromGit wulkano kap | grep -i x64)
+    else
+        archiveName="${name}-[0-9.]*-arm64.${type}"
+        downloadURL=$(downloadURLFromGit wulkano kap | grep -i arm64)
+    fi
+    appNewVersion=$(versionFromGit wulkano Kap)
+    expectedTeamID="2KEEHXF6R6"
+    ;;

fragments/labels/keepingyouawake.sh

@@ -0,0 +1,8 @@
+keepingyouawake)
+    name="KeepingYouAwake"
+    type="zip"
+    downloadURL=$(downloadURLFromGit newmarcel KeepingYouAwake)
+    appNewVersion=$(versionFromGit newmarcel KeepingYouAwake)
+    expectedTeamID="5KESHV9W85"
+    blockingProcesses=( "KeepingYouAwake" )
+    ;;

fragments/labels/knockknock.sh

@@ -1,7 +1,7 @@
 knockknock)
     name="KnockKnock"
     type="zip"
-    downloadURL=$( curl -fs "https://objective-see.com/products/knockknock.html" | grep https | grep "$type" | head -1 | tr '"' "\n" | grep "^http" )
-    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)\..*/\1/g' )
+    downloadURL="$(downloadURLFromGit objective-see KnockKnock)"
+    appNewVersion="$(versionFromGit objective-see KnockKnock)"
     expectedTeamID="VBG97UB4TA"
     ;;

fragments/labels/lcadvancedvpnclient.sh

@@ -0,0 +1,7 @@
+lcadvancedvpnclient)
+    name="LANCOM Advanced VPN Client"
+    type="pkgInDmg"
+    appNewVersion=$(curl -fs https://www.ncp-e.com/de/service/download-vpn-client/ | grep -m 1 "NCP Secure Entry macOS Client" -A 1 | grep -i Version | sed  "s|.*Version \(.*\) Rev.*|\\1|")
+    downloadURL=$(appShortVersion=`sed 's/[^0-9]//g' <<< $appNewVersion` && echo https://ftp.lancom.de/LANCOM-Releases/LC-VPN-Client/LC-Advanced-VPN-Client-macOS-"${appShortVersion}"-Rel-x86-64.dmg)
+    expectedTeamID="LL3KBL2M3A"
+    ;;

fragments/labels/libreoffice.sh

@@ -2,11 +2,11 @@ libreoffice)
     name="LibreOffice"
     type="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"
+        arch_type="aarch64"
     fi
-    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)_.*/\1/g' )
+    libreoffice_latest_version="$(curl -Ls https://www.libreoffice.org/download/download-libreoffice/ | grep dl_version_number | head -n 1 | cut -d'>' -f3 | cut -d'<' -f1)"
+    downloadURL="https://download.documentfoundation.org/libreoffice/stable/${libreoffice_latest_version}/mac/${arch_type:-x86_64}/LibreOffice_${libreoffice_latest_version}_MacOS_${arch_type:-x86-64}.dmg"
+    appNewVersion=$(echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*_([0-9.]*)_.*/\1/g')
     expectedTeamID="7P5S3ZLCN7"
     blockingProcesses=( soffice )
     ;;

fragments/labels/macports.sh

@@ -13,7 +13,7 @@ macports)
             archiveName="Catalina.pkg"
             ;;
         *)
-            cleanupAndExit 1 "macOS 10.14 or earlier not supported by Installomator."
+            cleanupAndExit 98 "macOS 10.14 or earlier not supported by Installomator."
             ;;
     esac
     downloadURL=$(downloadURLFromGit macports macports-base)

fragments/labels/marathon.sh

@@ -2,6 +2,7 @@ marathon)
     name="Marathon"
     type="dmg"
     archiveName="Marathon-[0-9.]*-Mac.dmg"
+    versionKey="CFBundleVersion"
     downloadURL="$(downloadURLFromGit Aleph-One-Marathon alephone)"
     appNewVersion="$(versionFromGit Aleph-One-Marathon alephone)"
     expectedTeamID="E8K89CXZE7"

fragments/labels/marathon2.sh

@@ -2,6 +2,7 @@ marathon2)
     name="Marathon 2"
     type="dmg"
     archiveName="Marathon2-[0-9.]*-Mac.dmg"
+    versionKey="CFBundleVersion"
     downloadURL="$(downloadURLFromGit Aleph-One-Marathon alephone)"
     appNewVersion="$(versionFromGit Aleph-One-Marathon alephone)"
     expectedTeamID="E8K89CXZE7"

fragments/labels/marathoninfinity.sh

@@ -2,6 +2,7 @@ marathoninfinity)
     name="Marathon Infinity"
     type="dmg"
     archiveName="MarathonInfinity-[0-9.]*-Mac.dmg"
+    versionKey="CFBundleVersion"
     downloadURL="$(downloadURLFromGit Aleph-One-Marathon alephone)"
     appNewVersion="$(versionFromGit Aleph-One-Marathon alephone)"
     expectedTeamID="E8K89CXZE7"

fragments/labels/masv.sh

@@ -0,0 +1,6 @@
+masv)
+    name="MASV"
+    type="dmg"
+    downloadURL="https://dl.massive.io/MASV.dmg"
+    expectedTeamID="VHKX7RCAY7"
+    ;;

fragments/labels/merlinproject.sh

@@ -0,0 +1,7 @@
+merlinproject)
+    name="Merlin Project"
+    type="zip"
+    downloadURL="https://www.projectwizards.net/downloads/MerlinProject.zip"
+    appNewVersion="$(curl -fs "https://www.projectwizards.net/de/support/release-notes"  | grep Version | head -n 6 | tail -n 1 | sed 's/[^0-9.]*//g')"
+    expectedTeamID="9R6P9VZV27"
+    ;;

fragments/labels/microsoftyammer.sh

@@ -1,10 +0,0 @@
-microsoftyammer)
-    name="Yammer"
-    type="dmg"
-    downloadURL="https://aka.ms/yammer_desktop_mac"
-    #appNewVersion=$(curl -fs https://macadmins.software/latest.xml | xpath '//latest/oldpackage[id="com.microsoft.yammer.standalone"]/cfbundleshortversionstring' 2>/dev/null | sed -E 's/<cfbundleshortversionstring>([0-9.]*)<.*/\1/')
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location: | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g')
-    expectedTeamID="UBF8T346G9"
-    #updateTool="/Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate --list; /Library/Application Support/Microsoft/MAU2.0/Microsoft AutoUpdate.app/Contents/MacOS/msupdate"
-    #updateToolArguments=( --install --apps ?????? )
-    ;;

fragments/labels/miro.sh

@@ -2,6 +2,10 @@ miro)
     # credit: @matins
     name="Miro"
     type="dmg"
-    downloadURL="https://desktop.miro.com/platforms/darwin/Miro.dmg"
+    if [[ $(arch) == arm64 ]]; then
+        downloadURL="https://desktop.miro.com/platforms/darwin-arm64/Miro.dmg"
+    elif [[ $(arch) == i386 ]]; then
+        downloadURL="https://desktop.miro.com/platforms/darwin/Miro.dmg"
+    fi
     expectedTeamID="M3GM7MFY7U"
     ;;

fragments/labels/mmhmm.sh

@@ -0,0 +1,8 @@
+mmhmm)
+    name="mmhmm"
+    type="pkg"
+    downloadURL="https://updates.mmhmm.app/mac/mmhmm.pkg"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15" )
+    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://help.mmhmm.app/hc/en-us/articles/4420969712151-mmhmm-for-Mac" | grep 'The latest version of mmhmm for Mac is <strong>*' | sed -e 's/.*\<strong\>\(.*\)\.\<\/strong\>.*/\1/')
+    expectedTeamID="M3KUT44L48"
+    ;;

fragments/labels/mongodbcompass.sh

@@ -0,0 +1,8 @@
+mongodbcompass)
+    name="MongoDB Compass"
+    type="dmg"
+    archiveName="mongodb-compass-[0-9.]*-darwin-x64.dmg"
+    downloadURL="$(downloadURLFromGit mongodb-js compass)"
+    appNewVersion="$(versionFromGit mongodb-js compass)"
+    expectedTeamID="4XWMY46275"
+    ;;

fragments/labels/netspot.sh

@@ -0,0 +1,7 @@
+netspot)
+    name="NetSpot"
+    type="dmg"
+    downloadURL="https://cdn.netspotapp.com/download/NetSpot.dmg"
+    appNewVersion=$(curl -fs "https://www.netspotapp.com/updates/netspot2-appcast.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:version)' 2>/dev/null | cut -d '"' -f 2)
+    expectedTeamID="5QLDY8TU83"
+    ;;

fragments/labels/nordlayer.sh

@@ -0,0 +1,7 @@
+nordlayer)
+    # credit: Taboc741 (https://github.com/taboc741)
+    name="NordLayer"
+    type="pkg"
+    downloadURL="https://downloads.nordlayer.com/mac/latest/NordLayer.pkg"
+    expectedTeamID="W5W395V82Y"
+    ;;

fragments/labels/notion.sh

@@ -4,9 +4,10 @@ notion)
     type="dmg"
     if [[ $(arch) == "arm64" ]]; then
         downloadURL="https://www.notion.so/desktop/apple-silicon/download"
+        appNewVersion=$( curl -fsIL "https://www.notion.so/desktop/apple-silicon/download" | grep -i "^location" | awk '{print $2}' | sed -e 's/.*Notion\-\(.*\)\-arm64.dmg.*/\1/' )
     elif [[ $(arch) == "i386" ]]; then
         downloadURL="https://www.notion.so/desktop/mac/download"
+        appNewVersion=$( curl -fsIL "https://www.notion.so/desktop/mac/download" | grep -i "^location" | awk '{print $2}' | sed -e 's/.*Notion\-\(.*\).dmg.*/\1/' )
     fi
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
     expectedTeamID="LBQJ96FQ8D"
     ;;

fragments/labels/opera.sh

@@ -1,8 +1,8 @@
 opera)
     name="Opera"
     type="dmg"
-    downloadURL=$(curl -fsIL "$(curl -fs "$(curl -fsIL "https://download.opera.com/download/get/?partner=www&opsys=MacOS" | grep -i "^location" | cut -d " " -f2 | tail -1 | tr -d '\r')" | grep download.opera.com | grep -io "https.*yes" | sed 's/\&/\&/g')" | grep -i "^location" | cut -d " " -f2 | tr -d '\r')
-    appNewVersion="$(curl -fs "https://get.geo.opera.com/ftp/pub/opera/desktop/" | grep "href=\"\d" | sort -V | tail -1 | tr '"' '\n' | grep "/" | head -1 | tr -d '/')"
+    downloadURL="$(curl -fsIL "$(curl -fs "$(curl -fsL "https://download.opera.com/download/get/?partner=www&opsys=MacOS" | tr '"' "\n" | grep -e "www.opera.com.*thanks.*opera" | sed 's/\&amp\;/\&/g')" | tr '"' "\n" | grep "download.opera.com" | sed 's/\&amp\;/\&/g')" | grep -i "^location" | grep -io "https.*dmg")"
+    appNewVersion="$(printf "$downloadURL" | sed -E 's/https.*\/([0-9.]*)\/mac\/.*/\1/')"
 	versionKey="CFBundleVersion"
     expectedTeamID="A2P9LX4JPN"
     ;;

fragments/labels/prune.sh

@@ -0,0 +1,7 @@
+prune)
+    name="Prune"
+    type="zip"
+    downloadURL=$(downloadURLFromGit BIG-RAT Prune)
+    appNewVersion=$(versionFromGit BIG-RAT Prune)
+    expectedTeamID="PS2F6S478M"
+;;

fragments/labels/relatel.sh

@@ -0,0 +1,7 @@
+relatel)
+    name="Relatel"
+    type="dmg"
+    downloadURL="https://cdn.rela.tel/www/public/junotron/Relatel.dmg"
+    appNewVersion="$(curl -fs "https://cdn.firmafon.dk/www/public/junotron/latest-mac.yml" | grep -i "version" | cut -w -f2)"
+    expectedTeamID="B9358QF55B"
+    ;;

fragments/labels/remotix.sh

@@ -1,7 +0,0 @@
-remotix)
-    name="Remotix"
-    type="dmg"
-    downloadURL="https://remotix.com/downloads/latest-remotix-mac/"
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*\.dmg/\1/g' )
-    expectedTeamID="K293Y6CVN4"
-    ;;

fragments/labels/remotixagent.sh

@@ -1,8 +0,0 @@
-remotixagent)
-    name="RemotixAgent"
-    type="pkg"
-    packageID="com.nulana.rxagentmac"
-    downloadURL="https://remotix.com/downloads/latest-agent-mac/"
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*\.pkg/\1/g' )
-    expectedTeamID="K293Y6CVN4"
-    ;;

fragments/labels/ringcentralapp.sh

@@ -1,6 +1,6 @@
 ringcentralapp)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
-    name="Ringcentral"
+    name="RingCentral"
     type="pkg"
     if [[ $(arch) != "i386" ]]; then
         downloadURL="https://app.ringcentral.com/download/RingCentral-arm64.pkg"
@@ -8,5 +8,5 @@ ringcentralapp)
         downloadURL="https://app.ringcentral.com/download/RingCentral.pkg"
     fi
     expectedTeamID="M932RC5J66"
-    blockingProcesses=( "Ringcentral" )
+    blockingProcesses=( "RingCentral" )
     ;;

fragments/labels/sonicvisualiser.sh

@@ -0,0 +1,7 @@
+sonicvisualiser)
+    name="Sonic Visualiser"
+    type="dmg"
+    downloadURL="$(downloadURLFromGit sonic-visualiser sonic-visualiser)"
+    appNewVersion="$(versionFromGit sonic-visualiser sonic-visualiser)"
+    expectedTeamID="73F996B92S"
+    ;;

fragments/labels/strongdm.sh

@@ -0,0 +1,9 @@
+strongdm)
+    name="strongDM"
+    type="dmg"
+    downloadURL="https://app.strongdm.com/downloads/client/darwin"
+    appNewVersion=$(curl -fsLIXGET "https://app.strongdm.com/downloads/client/darwin" | grep -i "^content-disposition" | sed -e 's/.*filename\=\"SDM\-\(.*\)\.dmg\".*/\1/')
+    appName="SDM.app"
+    blockingProcesses=( "SDM" )
+    expectedTeamID="W5HSYBBJGA"
+    ;;

fragments/labels/sublimetext.sh

@@ -2,7 +2,7 @@ sublimetext)
     # credit: Søren Theilgaard (@theilgaard)
     name="Sublime Text"
     type="zip"
-    downloadURL="$(curl -fs https://www.sublimetext.com/download | grep -io "https://download.*_mac.zip")"
+    downloadURL="$(curl -fs "https://www.sublimetext.com/download_thanks?target=mac#direct-downloads" | grep -io "https://download.*_mac.zip" | head -1)"
     appNewVersion=$(curl -fs https://www.sublimetext.com/download | grep -i -A 4 "id.*changelog" | grep -io "Build [0-9]*")
     expectedTeamID="Z6D26JE4Y4"
     ;;

fragments/labels/supportapp.sh

@@ -5,6 +5,5 @@ supportapp)
     downloadURL=$(downloadURLFromGit root3nl SupportApp)
     appNewVersion=$(versionFromGit root3nl SupportApp)
     expectedTeamID="98LJ4XBGYK"
-    uid=$(id -u "$currentUser")
-    launchctl bootout gui/${uid} "/Library/LaunchAgents/nl.root3.support.plist"
+    blockingProcesses=( NONE )
     ;;

fragments/labels/synologyassistant.sh

@@ -0,0 +1,8 @@
+synologyassistant)
+    name="SynologyAssistant"
+    type="dmg"
+    packageID="com.synology.DSAssistant"
+    appNewVersion="$(curl -sf https://archive.synology.com/download/Utility/Assistant | grep -m 1 /download/Utility/Assistant/ | sed "s|.*>\(.*\)<.*|\\1|")"
+    downloadURL="https://global.download.synology.com/download/Utility/Assistant/${appNewVersion}/Mac/synology-assistant-${appNewVersion}.dmg"
+    expectedTeamID="X85BAK35Y4"
+    ;;

fragments/labels/synologydriveclient.sh

@@ -0,0 +1,8 @@
+synologydriveclient)
+    name="Synology Drive Client"
+    type="pkgInDmg"
+    packageID="com.synology.CloudStation"
+    downloadURL=$(appVersion=`curl -sf https://archive.synology.com/download/Utility/SynologyDriveClient | grep -m 1 /download/Utility/SynologyDriveClient/ | sed "s|.*>\(.*\)<.*|\\1|"` && appShortVersion=`sed 's#.*-\(\)#\1#' <<< $appVersion` && echo https://global.download.synology.com/download/Utility/SynologyDriveClient/"$appVersion"/Mac/Installer/synology-drive-client-"${appShortVersion}".dmg)
+    appNewVersion=$(appVersionP1=`curl -sf https://archive.synology.com/download/Utility/SynologyDriveClient | grep -m 1 /download/Utility/SynologyDriveClient/ | sed "s|.*>\(.*\)-.*|\\1|"` && sed 's/\(.\{0\}\)./\17/' <<< $appVersionP1)
+    expectedTeamID="X85BAK35Y4"
+    ;;

fragments/labels/talkdeskcallbar.sh

@@ -1,7 +1,8 @@
 talkdeskcallbar)
     name="Callbar"
     type="dmg"
-    appNewVersion=$(curl -fsL https://downloadcallbar.talkdesk.com/release_metadata.json | sed -n 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p')
+    talkdeskcallbarVersions=$(curl -fsL "https://downloadcallbar.talkdesk.com/release_metadata.json")
+    appNewVersion=$(getJSONValue "$talkdeskcallbarVersions" "version")
     downloadURL=https://downloadcallbar.talkdesk.com/Callbar-${appNewVersion}.dmg
     expectedTeamID="YGGJX44TB8"
     ;;

fragments/labels/talkdeskcxcloud.sh

@@ -1,7 +1,8 @@
 talkdeskcxcloud)
     name="Talkdesk"
     type="dmg"
-    appNewVersion=$(curl -fs https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json | sed -n -e 's/^.*"version"[[:space:]]*:[[:space:]]*"\([^"]*\)".*$/\1/p' | head -n 1)
+    talkdeskcxcloudVersions=$(curl -fs "https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-latest-metadata.json")
+    appNewVersion=$(getJSONValue "$talkdeskcxcloudVersions" "[0].version")
     downloadURL="https://td-infra-prd-us-east-1-s3-atlaselectron.s3.amazonaws.com/talkdesk-${appNewVersion}.dmg"
     expectedTeamID="YGGJX44TB8"
     ;;

fragments/labels/tencentmeeting.sh

@@ -0,0 +1,15 @@
+tencentmeeting)
+    name="TencentMeeting"
+    type="dmg"
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL="$(curl -fs 'https://meeting.tencent.com/web-service/query-download-info?q=%5B%7B%22package-type%22%3A%22app%22%2C%22channel%22%3A%220300000000%22%2C%22platform%22%3A%22mac%22%2C%22arch%22%3A%22arm64%22%7D%5D&c_os=web&c_os_version=1&c_os_model=web&c_timestamp=1653366550252&c_instance_id=5&c_nonce=DcaDam4y&c_app_id=1400143280&c_app_version=1&c_lang=zh-cn&c_district=0&nonce=miwSceJNQaSZttma' -H 'authority: meeting.tencent.com' -H 'referer: https://meeting.tencent.com/download-mac.html?from=1000&fromSource=1&macType=apple' -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15' | grep -o "https://updatecdn.meeting.qq.com[^']*\.publish.arm64.dmg")"
+        appNewVersion=$(curl -fs 'https://meeting.tencent.com/web-service/query-download-info?q=%5B%7B%22package-type%22%3A%22app%22%2C%22channel%22%3A%220300000000%22%2C%22platform%22%3A%22mac%22%2C%22arch%22%3A%22arm64%22%7D%5D&c_os=web&c_os_version=1&c_os_model=web&c_timestamp=1653366550252&c_instance_id=5&c_nonce=DcaDam4y&c_app_id=1400143280&c_app_version=1&c_lang=zh-cn&c_district=0&nonce=miwSceJNQaSZttma' -H 'authority: meeting.tencent.com' -H 'referer: https://meeting.tencent.com/download-mac.html?from=1000&fromSource=1&macType=apple' -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15' | grep -o "https://updatecdn.meeting.qq.com[^']*\.publish.arm64.dmg" | sed -e 's/.*TencentMeeting\_0300000000\_\(.*\)\.publish\.arm64\.dmg.*/\1/')
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL="$(curl -fs 'https://meeting.tencent.com/web-service/query-download-info?q=%5B%7B%22package-type%22%3A%22app%22%2C%22channel%22%3A%220300000000%22%2C%22platform%22%3A%22mac%22%2C%22arch%22%3A%22x86_64%22%7D%5D&c_os=web&c_os_version=1&c_os_model=web&c_timestamp=1653366500890&c_instance_id=5&c_nonce=jA4P4JPY&c_app_id=1400143280&c_app_version=1&c_lang=zh-cn&c_district=0&nonce=tF6Bm4FYHJwdPeGH' -H 'authority: meeting.tencent.com' -H 'referer: https://meeting.tencent.com/download-mac.html?from=1000&fromSource=1' -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15' | grep -o "https://updatecdn.meeting.qq.com[^']*\.publish.x86_64.dmg")"
+        appNewVersion=$(curl -fs 'https://meeting.tencent.com/web-service/query-download-info?q=%5B%7B%22package-type%22%3A%22app%22%2C%22channel%22%3A%220300000000%22%2C%22platform%22%3A%22mac%22%2C%22arch%22%3A%22x86_64%22%7D%5D&c_os=web&c_os_version=1&c_os_model=web&c_timestamp=1653366500890&c_instance_id=5&c_nonce=jA4P4JPY&c_app_id=1400143280&c_app_version=1&c_lang=zh-cn&c_district=0&nonce=tF6Bm4FYHJwdPeGH' -H 'authority: meeting.tencent.com' -H 'referer: https://meeting.tencent.com/download-mac.html?from=1000&fromSource=1' -H 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15' | grep -o "https://updatecdn.meeting.qq.com[^']*\.publish.x86_64.dmg" | sed -e 's/.*TencentMeeting\_0300000000\_\(.*\)\.publish\.x86_64\.dmg.*/\1/')
+    fi
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15" )
+    appCustomVersion() { echo "$(defaults read /Applications/TencentMeeting.app/Contents/Info.plist CFBundleShortVersionString)$(echo ".")$(defaults read /Applications/TencentMeeting.app/Contents/Info.plist CFBundleVersion)" }
+    expectedTeamID="88L2Q4487U"
+    ;;
+

fragments/labels/typinator.sh

@@ -0,0 +1,7 @@
+typinator)
+    name="Typinator"
+    type="zip"
+    downloadURL=https://update.ergonis.com/downloads/products/typinator/Typinator.app.zip
+    appNewVersion="$(curl -fs https://update.ergonis.com/vck/typinator.xml | grep -i Program_Version | sed "s|.*>\(.*\)<.*|\\1|")"
+    expectedTeamID="TU7D9Y7GTQ"
+    ;;

fragments/labels/vmwarehorizonclient.sh

@@ -1,7 +1,8 @@
 vmwarehorizonclient)
     name="VMware Horizon Client"
     type="dmg"
-    downloadURL=$(curl -fsL "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | grep -o 'Url.*..dmg"' | cut -d '"' -f3)
-    appNewVersion=$(curl -fsL "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=CART21FQ2_MAC_800&productId=1027&rPId=48989" | sed 's/.*-\(.*\)-.*/\1/')
-    expectedTeamID="EG7KH642X6"
+    downloadGroup=$(curl -fsL "https://my.vmware.com/channel/public/api/v1.0/products/getRelatedDLGList?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&version=horizon_8&dlgType=PRODUCT_BINARY" | grep -o '[^"]*_MAC_[^"]*')
+    fileName=$(curl -fsL "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&category=desktop_end_user_computing&product=vmware_horizon_clients&dlgType=PRODUCT_BINARY&downloadGroup=${downloadGroup}" | grep -o '"fileName":"[^"]*"' | cut -d: -f2 | sed 's/"//g')
+    downloadURL="https://download3.vmware.com/software/$downloadGroup/${fileName}"
+    appNewVersion=$(curl -fsL "https://my.vmware.com/channel/public/api/v1.0/dlg/details?locale=en_US&downloadGroup=${downloadGroup}" | grep -o '[^"]*\.dmg[^"]*' | sed 's/.*-\(.*\)-.*/\1/')    expectedTeamID="EG7KH642X6"
     ;;

fragments/labels/whatroute.sh

@@ -0,0 +1,7 @@
+whatroute)
+    name="WhatRoute"
+    type="zip"
+    downloadURL="$(curl -fs https://www.whatroute.net/whatroute2appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2)"
+    appNewVersion="$(curl -fs https://www.whatroute.net/whatroute2appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | cut -d '"' -f2)"
+    expectedTeamID="H5879E8LML"
+    ;;

fragments/labels/wireshark.sh

@@ -1,11 +1,11 @@
 wireshark)
     name="Wireshark"
     type="dmg"
-    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')
+    if [[ $(arch) == i386 ]]; then
+      downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20$appNewVersion%20Intel%2064.dmg"
+    elif [[ $(arch) == arm64 ]]; then
+      downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20$appNewVersion%20Arm%2064.dmg"
+    fi
     expectedTeamID="7Z6EMTD2C6"
     ;;

fragments/labels/xcreds.sh

@@ -0,0 +1,11 @@
+xcreds)
+    name="XCreds"
+    #type="pkgInZip"
+    #packageID="com.twocanoes.pkg.secureremoteaccess"
+    #downloadURL=$(curl -fs "https://twocanoes.com/products/mac/xcreds/" | grep -ioE "https://.*\.zip" | head -1)
+    #appNewVersion=$(curl -fs "https://twocanoes.com/products/mac/xcreds/" | grep -io "Current Version:.*" | sed -E 's/.*XCreds *([0-9.]*)<.*/\1/g')
+    type="pkg"
+    downloadURL="$(downloadURLFromGit twocanoes xcreds)"
+    appNewVersion="$(versionFromGit twocanoes xcreds)"
+    expectedTeamID="UXP6YEHSPW"
+    ;;

fragments/main.sh

@@ -15,10 +15,33 @@ fi
 
 # MARK: application download and installation starts here
 
+# Debug output of all variables in a label
+printlog "name=${name}" DEBUG
+printlog "appName=${appName}" DEBUG
+printlog "type=${type}" DEBUG
+printlog "archiveName=${archiveName}" DEBUG
+printlog "downloadURL=${downloadURL}" DEBUG
+printlog "curlOptions=${curlOptions}" DEBUG
+printlog "appNewVersion=${appNewVersion}" DEBUG
+printlog "appCustomVersion function: $(if type 'appCustomVersion' 2>/dev/null | grep -q 'function'; then echo "Defined. ${appCustomVersion}"; else; echo "Not defined"; fi)" DEBUG
+printlog "versionKey=${versionKey}" DEBUG
+printlog "packageID=${packageID}" DEBUG
+printlog "pkgName=${pkgName}" DEBUG
+printlog "choiceChangesXML=${choiceChangesXML}" DEBUG
+printlog "expectedTeamID=${expectedTeamID}" DEBUG
+printlog "blockingProcesses=${blockingProcesses}" DEBUG
+printlog "installerTool=${installerTool}" DEBUG
+printlog "CLIInstaller=${CLIInstaller}" DEBUG
+printlog "CLIArguments=${CLIArguments}" DEBUG
+printlog "updateTool=${updateTool}" DEBUG
+printlog "updateToolArguments=${updateToolArguments}" DEBUG
+printlog "updateToolRunAsCurrentUser=${updateToolRunAsCurrentUser}" DEBUG
+#printlog "Company=${Company}" DEBUG # Not used
+
 if [[ ${INTERRUPT_DND} = "no" ]]; then
     # Check if a fullscreen app is active
     if hasDisplaySleepAssertion; then
-        cleanupAndExit 1 "active display sleep assertion detected, aborting" ERROR
+        cleanupAndExit 24 "active display sleep assertion detected, aborting" ERROR
     fi
 fi
 
@@ -60,6 +83,11 @@ case $LOGO in
         LOGO="/Library/Intune/Microsoft Intune Agent.app/Contents/Resources/AppIcon.icns"
         if [[ -z $MDMProfileName ]]; then; MDMProfileName="Management Profile"; fi
         ;;
+    ws1)
+        # Workspace ONE (AirWatch)
+        LOGO="/Applications/Workspace ONE Intelligent Hub.app/Contents/Resources/AppIcon.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="Device Manager"; fi
+        ;;
 esac
 if [[ ! -a "${LOGO}" ]]; then
     if [[ $(sw_vers -buildVersion) > "19" ]]; then
@@ -75,7 +103,7 @@ printlog "Label type: $type" INFO
 # MARK: extract info from data
 if [ -z "$archiveName" ]; then
     case $type in
-        dmg|pkg|zip|tbz)
+        dmg|pkg|zip|tbz|bz2)
             archiveName="${name}.$type"
             ;;
         pkgInDmg)
@@ -101,7 +129,7 @@ fi
 
 if [ -z "$targetDir" ]; then
     case $type in
-        dmg|zip|tbz|app*)
+        dmg|zip|tbz|bz2|app*)
             targetDir="/Applications"
             ;;
         pkg*)
@@ -132,7 +160,7 @@ fi
 # MARK: change directory to temporary working directory
 printlog "Changing directory to $tmpDir" DEBUG
 if ! cd "$tmpDir"; then
-    cleanupAndExit 1 "error changing directory $tmpDir" ERROR
+    cleanupAndExit 13 "error changing directory $tmpDir" ERROR
 fi
 
 # MARK: get installed version
@@ -168,6 +196,8 @@ fi
 # MARK: check if this is an Update and we can use updateTool
 if [[ (-n $appversion && -n "$updateTool") || "$type" == "updateronly" ]]; then
     printlog "appversion & updateTool"
+    updateDialog "wait" "Updating..."
+
     if [[ $DEBUG -ne 1 ]]; then
         if runUpdateTool; then
             finishing
@@ -194,8 +224,28 @@ else
             displaynotification "Downloading new $name" "Download in progress …"
         fi
     fi
-    curlDownload=$(curl -v -fsL --show-error ${curlOptions} "$downloadURL" -o "$archiveName" 2>&1)
-    curlDownloadStatus=$(echo $?)
+
+    if [[ $DIALOG_CMD_FILE != "" ]]; then
+        # pipe
+        pipe="$tmpDir/downloadpipe"
+        # initialise named pipe for curl output
+        initNamedPipe create $pipe
+
+        # run the pipe read in the background
+        readDownloadPipe $pipe "$DIALOG_CMD_FILE" & downloadPipePID=$!
+        printlog "listening to output of curl with pipe $pipe and command file $DIALOG_CMD_FILE on PID $downloadPipePID" DEBUG
+
+        curlDownload=$(curl -fL -# --show-error ${curlOptions} "$downloadURL" -o "$archiveName" 2>&1 | tee $pipe)
+        # because we are tee-ing the output, we want the pipe status of the first command in the chain, not the most recent one
+        curlDownloadStatus=$(echo $pipestatus[1])
+        killProcess $downloadPipePID
+
+    else
+        printlog "No Dialog connection, just download" DEBUG
+        curlDownload=$(curl -v -fsL --show-error ${curlOptions} "$downloadURL" -o "$archiveName" 2>&1)
+        curlDownloadStatus=$(echo $?)
+    fi
+
     deduplicatelogs "$curlDownload"
     if [[ $curlDownloadStatus -ne 0 ]]; then
     #if ! curl --location --fail --silent "$downloadURL" -o "$archiveName"; then
@@ -237,8 +287,10 @@ if [[ $currentUser != "loginwindow" && $NOTIFY == "all" ]]; then
     printlog "notifying"
     if [[ $updateDetected == "YES" ]]; then
         displaynotification "Updating $name" "Installation in progress …"
+        updateDialog "wait" "Updating..."
     else
         displaynotification "Installing $name" "Installation in progress …"
+        updateDialog "wait" "Installing..."
     fi
 fi
 
@@ -258,7 +310,7 @@ case $type in
     zip)
         installFromZIP
         ;;
-    tbz)
+    tbz|bz2)
         installFromTBZ
         ;;
     pkgInDmg)
@@ -275,6 +327,8 @@ case $type in
         ;;
 esac
 
+updateDialog "wait" "Finishing..."
+
 # MARK: Finishing — print installed application location and version
 finishing
 

fragments/version.sh

@@ -1 +1 @@
-9.2
+10.0beta2

utils/README.md

@@ -1,6 +1,6 @@
 # How to assemble Installomator.sh
 
-Since the Installomator.sh script has grown to over 3000 lines, its management on git has become very unwieldy. The single file with all the logic and the data required to download and install the applications creates constant merge conflicts which add to the workload of the repo admins, especially when part of the team is working on the logic of the script while we still get PRs to add labels.
+Since the Installomator.sh script has grown to over 5000 lines, its management on git has become very unwieldy. The single file with all the logic and the data required to download and install the applications creates constant merge conflicts which add to the workload of the repo admins, especially when part of the team is working on the logic of the script while we still get PRs to add labels.
 
 Because of that we have split the main script into multiple files which are easier to manage. Having multiple files results in less merge conflicts.
 
@@ -53,7 +53,7 @@ Once you are certain that your new custom label works, you can use the code from
 
 The `Installomator.sh` script at the root of the repo does not really get involved in your building and testing. Similarly, if you want to apply, test, and contribute changes to the script's logic, you should modify the fragment file in question and test using the assemble script.
 
-Pull requests against the `Installomator.sh` script in the root of the repo will be rejected. (Excepting the backlog of existing PRs.)
+Pull requests against the `Installomator.sh` script in the root of the repo will be rejected.
 
 ## How do I contribute new or modified labels back to the Installomator project?
 
@@ -70,11 +70,13 @@ If you have multiple labels (or other changes) you want to contribute, please cr
 
 Once your Pull Request is merged into the main repo, you can pull the change to your local repo, push it to your fork, and delete the branch, because it should be fully merged.
 
+When you have multiple labels or changes, please create a separate issue for each label or change, unless they are closely related
+
+
 ### When you are not familiar with git and GitHub
 
-Create an Issue in the Installomator repo and include the contents of your custom label file.
+We have a tutorial on [How to create Pull Requests in GitHub](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue).
 
-If you have multiple labels, please create a separate issue for each label.
 
 ## Fragments
 
@@ -109,7 +111,7 @@ All the contents of the label files in `labels` (and any custom label locations
 
 Finally, the `main.sh` fragment contains most of the main logic.
 
-The assemble script does not check _any_ of the files for syntax or completeness. You are responsible that everything fits together properly. (Pay special attention to remember the closing semi-colons `;;` in the label files.)
+The assemble script does not check _any_ of the files for syntax or completeness. You are responsible that everything fits together properly. (Pay special attention to remember the closing semi-colons `;;` and a final line break in the label files.)
 
 ## assemble.sh Usage
 

utils/assemble.sh

@@ -120,6 +120,7 @@ chmod +x $destination_file
 # run script with remaining arguments
 if [[ $runScript -eq 1 ]]; then
     $destination_file "$@"
+    exit_code=$?
 fi
 
 # copy the script to root of repo when flag is set
@@ -127,6 +128,8 @@ if [[ $buildScript -eq 1 ]]; then
     echo "# copying script to $repo_dir/Installomator.sh"
     cp $destination_file $repo_dir/Installomator.sh
     chmod 755 $repo_dir/Installomator.sh
+    # also update Labels.txt
+    $repo_dir/Installomator.sh | tail -n +2 > $repo_dir/Labels.txt
 fi
 
 # build a pkg when flag is set
@@ -184,3 +187,5 @@ if [[ $notarizePkg -eq 1 ]]; then
     echo "# Stapling $productpath"
     xcrun stapler staple "$productpath"
 fi
+
+exit $exit_code

utils/buildLabel.sh

@@ -265,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|gz)$' # regular expression for matching
+fileName_re='^([a-zA-Z0-9\_.%-]*)\.(dmg|pkg|zip|tbz|gz|bz2)$' # regular expression for matching
 if [[ "${try1archiveName}" =~ $fileName_re ]]; then
     archiveName=${try1archiveName}
 elif [[ "${try2archiveName}" =~ $fileName_re ]]; then
@@ -293,7 +293,7 @@ if [ "$archiveExt" = "pkg" ]; then
 elif [ "$archiveExt" = "dmg" ]; then
     echo "Diskimage found"
     dmgInvestigation
-elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ]; then
+elif [ "$archiveExt" = "zip" ] || [ "$archiveExt" = "tbz" ] || [ "$archiveExt" = "bz2" ]; then
     echo "Compressed file found"
     # unzip the archive
     tar -xf "$archiveName"

utils/checkLabels.sh

@@ -52,9 +52,22 @@ downloadURLFromGit() { # $1 git user name, $2 git repo name
     gitusername=${1?:"no git user name"}
     gitreponame=${2?:"no git repo name"}
     
+    if [[ $type == "pkgInDmg" ]]; then
+        filetype="dmg"
+    elif [[ $type == "pkgInZip" ]]; then
+        filetype="zip"
+    else
+        filetype=$type
+    fi
+
     #githubPart="$gitusername/$gitreponame/releases/download"
     #echo "$githubPart"
-    downloadURL="https://github.com/$gitusername/$gitreponame/releases/latest"
+    #downloadURL="https://github.com/$gitusername/$gitreponame/releases/latest"
+    if [ -n "$archiveName" ]; then
+        downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*$archiveName" | head -1)
+    else
+        downloadURL=https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)
+    fi
     echo "$downloadURL"
     return 0
 }
@@ -63,7 +76,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://github.com/$gitusername/$gitreponame/releases/latest" | sed -E 's/.*tag\/(.*)\">.*/\1/g' | sed 's/[^0-9\.]//g')
+    appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
     if [ -z "$appNewVersion" ]; then
         printlog "could not retrieve version number for $gitusername/$gitreponame: $appNewVersion"
         exit 9
@@ -182,13 +195,14 @@ for fixedArch in i386 arm64; do
         
         #caseLabel
         if cat "${labels_dir}/${label}.sh" | grep -v -E '^[a-z0-9\_-]*(\)|\|\\)$' | grep -v ";;" > checkLabelCurrent.sh; then
+            INSTALL=force # This is only to prevent various Microsoft labels from running "msupdate --list"
             source checkLabelCurrent.sh
 
             echo "Name: $name"
             echo "Download URL: $downloadURL"
             echo "Type: $type"
             case $type in
-                dmg|pkg|zip|tbz)
+                dmg|pkg|zip|tbz|bz2)
                     expectedExtension="$type"
                     ;;
                 pkgInDmg)