Create forticlient_ztna.sh

CHANGELOG.md

@@ -1,109 +1,6 @@
-## 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.
-
-- bug fix (#434)
-- documentation updates (#485, #494)
-- new labels:
-    - 1password8 (#514)
-	- ultimakercura
-	- androidstudio (#547)
-	- atextlegacy (#464)
-	- camtasia2019, camtasia2020 (#499)
-	- clue, cluefull (#481)
-	- craftmanagerforsketch
-	- displaylinkmanager (#448)
-	- drawio (#480)
-	- duckduckgo
-	- egnytewebedit (#512)
-	- filezilla (#522)
-	- firefoxpkg_intl
-	- flycut (#501)
-	- fontexplorer (#523)
-	- hype (#524)
-	- idrive (#507), idrivethin (#509)
-	- imageoptim (#525)
-	- linear (#519)
-	- macoslaps (#502)
-	- mightymike
-	- mindmanager (#479)
-	- pika (#526)
-	- propresenter7 (#394)
-	- qgis-pr
-	- shottr (#516)
-	- slab (#487)
-	- snagit2019, snagit2020, snagit2021 (#498)
-	- sonobus (#490)
-	- talkdeskcxcloud (#452)
-	- thunderbird_intl (#497)
-	- unnaturalscrollwheels (#503)
-	- wechat (#510)
-	- xeroxworkcentre7800 (#527)
-	- zohoworkdrivegenie
-- updated labels
-	- adobereaderdc-update, adobereaderdc (#503)
-	- amazoncorretto8jdk (#461)
-	- camtasia (#499)
-	- citrixworkspace (#508)
-	- dbeaverce (#450)
-	- dropbox
-	- firefox, firefox_da, firefox_intl (#495), firefoxesr_intl (#496), firefoxpkg
-	- googlechrome, googlechromepkg (#484)
-	- gpgsuite (#465)
-	- grammarly (#515)
-	- logitechoptions (#478)
-	- onlyofficedesktop (#454)
-	- postman (#458)
-	- rancherdesktop (#463)
-	- remotedesktopmanagerenterprise
-	- remotedesktopmanagerfree
-	- ringcentralapp (#492)
-	- sketch
-	- snagit (#498)
-	- talkdeskcallbar (#453)
-
-
-
 ## v9.1
 
+**Note**: Both Google and Mozilla recommend using the pkg installers instead of the dmg downloads for managed deployments. So far, Installomator has provided labels for both. (`googlechrome` and `googlechromepkg` or `firefox` and `firefoxpkg`, respectively) Since there are problems with the dmg downloads, a future release of Installomator will _disable_ the `firefox` and `googlechrome` dmg labels. You should switch to using the respective pkg labels instead.
 
 - added option for Microsoft Endpoint Manager (Intune) to `LOGO` (#446)
 - minor fixes (#427, #434, #436)

CONTRIBUTING.md

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

@@ -1,5 +1,4 @@
 1password7
-1password8
 1passwordcli
 4kvideodownloader
 8x8
@@ -21,7 +20,6 @@ amazonchime
 amazoncorretto8jdk
 amazonworkspaces
 androidfiletransfer
-androidstudio
 anydesk
 apparency
 appcleaner
@@ -35,7 +33,6 @@ aquaskk
 arq7
 asana
 atext
-atextlegacy
 atom
 audacity
 authydesktop
@@ -56,7 +53,6 @@ bettertouchtool
 bitwarden
 blender
 bluejeans
-bluejeanswithaudiodriver
 boxdrive
 boxsync
 boxtools
@@ -68,9 +64,6 @@ calcservice
 calibre
 camostudio
 camtasia
-camtasia2019
-camtasia2020
-camtasia2021
 canva
 chatwork
 cisdem-documentreader
@@ -80,14 +73,11 @@ clickshare
 clipy
 closeio
 cloudya
-clue
-cluefull
 code42
 coderunner
 colourcontrastanalyser
 cormorant
 craftmanager
-craftmanagerforsketch
 cryptomator
 cyberduck
 daisydisk
@@ -104,18 +94,13 @@ dialog
 dialpad
 discord
 diskspace
-displaylinkmanager
 docker
 dockutil
-drawio
 drift
 dropbox
-duckduckgo
-duodevicehealth
 easeusdatarecoverywizard
 easyfind
 egnyte
-egnytewebedit
 element
 eraseinstall
 eshareosx
@@ -128,7 +113,6 @@ fastscripts
 favro
 ferdi
 figma
-filezilla
 findanyfile
 firefox
 firefox_da
@@ -137,18 +121,14 @@ firefoxesr
 firefoxesr_intl
 firefoxesrpkg
 firefoxpkg
-firefoxpkg_intl
 flowjo
 flux
-flycut
-fontexplorer
 front
 fsmonitor
 gimp
 githubdesktop
 golang
 googlechrome
-googlechromeenterprise
 googlechromepkg
 googledrive
 googledrivebackupandsync
@@ -170,21 +150,16 @@ hazel
 houdahspot
 hpeasyadmin
 hpeasystart
-hype
 hyper
 ibarcoder
 icons
-idrive
-idrivethin
 iina
-imageoptim
 imazingprofileeditor
 inkscape
 insomnia
 installomator
 installomator_theile
 intellijideace
-ipswupdater
 istatmenus
 iterm2
 itsycal
@@ -217,8 +192,6 @@ lastpass
 launchbar
 lexarrecoverytool
 libreoffice
-linear
-logioptions
 logitechoptions
 logseq
 loom
@@ -228,7 +201,6 @@ lulu
 macadminspython
 maccyapp
 macfuse
-macoslaps
 macports
 malwarebytes
 marathon
@@ -260,10 +232,7 @@ microsoftteams
 microsoftvisualstudiocode
 microsoftword
 microsoftyammer
-mightymike
-mindmanager
 miro
-mmhmm
 mobikinassistantforandroid
 mochakeyboard
 mochatelnet
@@ -279,7 +248,6 @@ netnewswire
 nextcloud
 nomad
 nomadlogin
-nordlayer
 notion
 nudge
 nvivo
@@ -308,7 +276,6 @@ paretosecurity
 parsec
 pdfsam
 perimeter81
-pika
 pitch
 plantronicshub
 platypus
@@ -320,13 +287,10 @@ privileges
 proctortrack
 promiseutility
 promiseutilityr
-propresenter7
 protonvpn
 proxyman
-prune
 pycharmce
 pymol
-qgis-pr
 r
 ramboxce
 rancherdesktop
@@ -358,7 +322,6 @@ secretive
 sequelpro
 sfsymbols
 shield
-shottr
 sidekick
 signal
 silnite
@@ -367,16 +330,12 @@ sizeup
 sketch
 sketchupviewer
 skype
-slab
 slack
 smartgit
 snagit
-snagit2019
 snagit2020
 snagit2021
-snagit2022
 snapgeneviewer
-sonobus
 sonos
 sonoss1
 sonoss2
@@ -399,7 +358,6 @@ tableaupublic
 tableaureader
 tageditor
 talkdeskcallbar
-talkdeskcxcloud
 taskpaper
 teamviewer
 teamviewerhost
@@ -412,7 +370,6 @@ textmate
 theunarchiver
 things
 thunderbird
-thunderbird_intl
 tidal
 toggltrack
 tom4aconverter
@@ -421,11 +378,9 @@ trex
 tunnelbear
 tunnelblick
 typora
-ultimakercura
 umbrellaroamingclient
 uniconverter
 universaltypeclient
-unnaturalscrollwheels
 utm
 vagrant
 vanilla
@@ -443,8 +398,6 @@ wallyezflash
 webex
 webexmeetings
 webexteams
-wechat
-whatroute
 whatsapp
 wickrme
 wickrpro
@@ -452,7 +405,6 @@ wireshark
 wordservice
 wwdc
 xeroxphaser7800
-xeroxworkcentre7800
 xink
 xmenu
 xquartz
@@ -461,7 +413,6 @@ yubikeymanagerqt
 zappy
 zeplin
 zohoworkdrive
-zohoworkdrivegenie
 zohoworkdrivetruesync
 zoom
 zoomclient

MDM/App script.sh

@@ -5,28 +5,8 @@ what="brave" # enter the software to install
 # To be used as a script sent out from a MDM.
 # Fill the variable "what" above with a label.
 # Script will run this label.
-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
-######################################################################
-# Parameters for reinstall/initial install (owner root:wheel):
-#   "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1"
-# Parameters for Self Service installed app:
-#   "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all"
-# Parameters for security important apps, like browsers (run automaticaly every day):
-#   "BLOCKING_PROCESS_ACTION=tell_user_then_kill"
-# Update of service apps (run automatically):
-#   "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent"
-parameters="BLOCKING_PROCESS_ACTION=tell_user_then_kill NOTIFY=all"
 ###############################################
 
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi
-
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
 caffeinatepid=$!
@@ -36,14 +16,18 @@ caffexit () {
     exit $1
 }
 
-cmdOutput="$(${destFile} ${what} LOGO=$LOGO $parameters LOGGING=WARN || true)"
+# Verify that Installomator has been installed
-# Check result
+destFile="/usr/local/Installomator/Installomator.sh"
-exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+if [ ! -e "${destFile}" ]; then
-if [[ ${exitStatus} -ne 0 ]] ; then
+    echo "Installomator not found here:"
-    echo -e "Error installing ${what}. Exit code ${exitStatus}"
+    echo "${destFile}"
-    #echo "$cmdOutput"
+    echo "Exiting."
-    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+    caffexit 99
-    echo "$errorOutput"
+fi
+
+${destFile} ${what} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force
+if [ $? != 0 ]; then
+# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
     echo "Error installing ${what}. Exit code $?"
     caffexit $?
 fi

MDM/App-loop script.sh

@@ -1,31 +1,11 @@
 #!/bin/zsh
 # Installation using Installomator
-whatList="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal" # enter the software to install separated with spaces
+what="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal" # enter the software to install separated with spaces
 
 # To be used as a script sent out from a MDM.
-# Fill the variable "whatList" above with labels separated by space " ".
+# Fill the variable "what" above with labels separated by space " ".
 # Script will loop through these labels.
-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
 ######################################################################
-# Parameters for reinstall/initial install (owner root:wheel):
-#   "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1"
-# Parameters for Self Service installed app:
-#   "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all"
-# Parameters for security important apps, like browsers (run automaticaly every day):
-#   "BLOCKING_PROCESS_ACTION=tell_user_then_kill"
-# Update of service apps (run automatically):
-#   "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent"
-parameters="BLOCKING_PROCESS_ACTION=tell_user NOTIFY=all"
-######################################################################
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi
 
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -39,17 +19,21 @@ caffexit () {
 # Count errors
 errorCount=0
 
-for what in $whatList; do
+# Verify that Installomator has been installed
-    #echo $what
+destFile="/usr/local/Installomator/Installomator.sh"
-    # Install software using Installomator
+if [ ! -e "${destFile}" ]; then
-    cmdOutput="$(${destFile} ${what} LOGO=$LOGO $parameters LOGGING=WARN || true)"
+    echo "Installomator not found here:"
-    # Check result
+    echo "${destFile}"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    echo "Exiting."
-    if [[ ${exitStatus} -ne 0 ]] ; then
+    caffexit 99
-        echo -e "Error installing ${what}. Exit code ${exitStatus}"
+fi
-        #echo "$cmdOutput"
+
-        errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+for item in $what; do
-        echo "$errorOutput"
+    #echo $item
+    ${destFile} ${item} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force
+    if [ $? != 0 ]; then
+    # This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
+        echo "[$(DATE)] Error installing ${item}. Exit code $?"
         let errorCount++
     fi
 done

MDM/InstallInstallomator.sh

@@ -1,43 +0,0 @@
-#!/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/Installomator update.sh

@@ -1,18 +1,9 @@
 #!/bin/bash
 # Updating Installomator
 # Usefull to push out after deployment if earlier version was deployed in DEP profile
+# Currently script uses valuesfromarguments as a label is not included before next release, so this can be used to install to version 0.7
 
 what="installomator" # enter the software to install
-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi
 
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -23,19 +14,30 @@ caffexit () {
     exit $1
 }
 
-# Install software using Installomator
+# Verify that Installomator has been installed
-cmdOutput="$(${destFile} ${what} LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent LOGGING=req || true)"
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    caffexit 99
+fi
 
-# Check result
+${destFile} valuesfromarguments\
-exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+            name=Installomator \
-if [[ ${exitStatus} -eq 0 ]] ; then
+            type=pkg \
-    echo -e "${what} succesfully installed.\n"
+            packageID=com.scriptingosx.Installomator \
-else
+            downloadURL=https://github.com/Installomator/Installomator/releases/download/v0.7release/Installomator-0.7.0.pkg \
-    echo -e "Error installing ${what}. Exit code ${exitStatus}\n"
+            appNewVersion=0.7 \
-    #echo "$cmdOutput"
+            expectedTeamID=JME5BW3F3R \
-    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+            BLOCKING_PROCESS_ACTION=ignore \
-    echo "$errorOutput"
+            NOTIFY=silent
-   	caffexit $exitStatus
+
+# ${destFile} ${what} BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent
+if [ $? != 0 ]; then
+# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
+    echo "Error installing ${what}. Exit code $?"
+    caffexit $?
 fi
 
 echo "[$(DATE)][LOG-END]"

MDM/MDMAddigy CustomSoftware.sh

@@ -5,34 +5,15 @@
 
 # Mark: Installation script
 # Just click “Add” to autogenerate the installer script line by clicking the “Add”-button next to the Installer PKG, replace with first line below
-/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (9.1.0)/Installomator-9.1.pkg" -target /
+/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (0.7.0)/Installomator-0.7.0.pkg" -target /
 
 # Installation using Installomator
-whatList="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed  separated with spaces
+what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed  separated with spaces
 
 # To be used as a script sent out from a MDM.
-# Fill the variable "whatList" above with labels separated by space " ".
+# Fill the variable "what" above with labels separated by space " ".
 # Script will loop through these labels and exit with number of errors.
 ######################################################################
-# Parameters for reinstall/initial install (owner root:wheel):
-#   "BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes SYSTEMOWNER=1"
-# Parameters for Self Service installed app:
-#   "BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all"
-# Parameters for security important apps, like browsers (run automaticaly every day):
-#   "BLOCKING_PROCESS_ACTION=tell_user_then_kill"
-# Update of service apps (run automatically):
-#   "BLOCKING_PROCESS_ACTION=quit_kill NOTIFY=silent"
-parameters="BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force IGNORE_APP_STORE_APPS=yes"
-######################################################################
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi
 
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -46,17 +27,21 @@ caffexit () {
 # Count errors
 errorCount=0
 
-for what in $whatList; do
+# Verify that Installomator has been installed
-    #echo $what
+destFile="/usr/local/Installomator/Installomator.sh"
-    # Install software using Installomator
+if [ ! -e "${destFile}" ]; then
-    cmdOutput="$(${destFile} ${what} LOGO=addigy $parameters || true)"
+    echo "Installomator not found here:"
-    # Check result
+    echo "${destFile}"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    echo "Exiting."
-    if [[ ${exitStatus} -ne 0 ]] ; then
+    caffexit 99
-        echo -e "Error installing ${what}. Exit code ${exitStatus}"
+fi
-        #echo "$cmdOutput"
+
-        errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+for item in $what; do
-        echo "$errorOutput"
+    #echo $item
+    ${destFile} ${item} LOGO=addigy NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill #INSTALL=force
+    if [ $? != 0 ]; then
+    # Error handling
+        echo "[$(DATE)] Error installing ${item}. Exit code $?"
         let errorCount++
     fi
 done
@@ -71,7 +56,7 @@ caffexit $errorCount
 # Install on success
 # Remember to fill out the correct “TARGET_VERSION” and “PKG_ID”, and click "Install on succes".
 PKG_ID="com.scriptingosx.Installomator"
-TARGET_VERSION="9.1"
+TARGET_VERSION="8.0"
 
 vercomp () {
     if [[ $1 == $2 ]]; then

MDM/MDMMosyle install.sh

@@ -1,11 +1,10 @@
 PKG_ID="com.scriptingosx.Installomator"
-TARGET_VERSION="9.1"
+TARGET_VERSION="8.0"
 URLDOWNLOAD="%MosyleCDNFile:blah-blah-blah%"
 ######################################################################
-# Installation using Installomator (enter the software to install separated with spaces in the "whatList"-variable)
+# Installation using Installomator (enter the software to install separated with spaces in the "what"-variable)
-whatList="handbrake theunarchiver microsoftoffice365"
+what="handbrake theunarchiver microsoftoffice365"
 # Covered by Mosyle Catalog: "brave firefox googlechrome microsoftedge microsoftteams signal sublimetext vlc webex zoom" among others
-LOGO="mosyleb" # or "mosylem"
 ######################################################################
 
 ## Mark: Code here
@@ -57,17 +56,12 @@ if [ ! -e "${destFile}" ]; then
     caffexit 99
 fi
 
-for what in $whatList; do
+for item in $what; do
     #echo $item
-    # Install software using Installomator
+    ${destFile} ${item} LOGO=mosyle NOTIFY=all BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill #INSTALL=force
-    cmdOutput="$(${destFile} ${what} LOGO=$LOGO NOTIFY=all BLOCKING_PROCESS_ACTION=tell_user || true)" # NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill INSTALL=force
+    if [ $? != 0 ]; then
-    # Check result
+    # Error handling
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+        echo "[$(DATE)] Error installing ${item}. Exit code $?"
-    if [[ ${exitStatus} -ne 0 ]] ; then
-        echo "Error installing ${what}. Exit code ${exitStatus}"
-        #echo "$cmdOutput"
-        errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-        echo "$errorOutput"
         let errorCount++
     fi
 done

MDM/Manual valuesfromarguments.sh

@@ -1,20 +1,8 @@
 #!/bin/bash
-# Software
-
 # Installation using Installomator
 # Example of installing software using valuesfromarguments to install a custom software
 
-LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
+what="valuesfromarguments" # enter the software to install
-###############################################
-
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    exit 99
-fi
 
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -25,31 +13,29 @@ caffexit () {
     exit $1
 }
 
-# Variables to calculate
+# Verify that Installomator has been installed
-downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip"
+destFile="/usr/local/Installomator/Installomator.sh"
-appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath -e '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2)
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    caffexit 99
+fi
 
-# Install software using Installomator
+${destFile} valuesfromarguments \
-cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
+            name=\"Zoho\ WorkDrive\" \
-    name=CraftManager \
+            type=dmg \
-    type=zip \
+            downloadURL=https://files-accl.zohopublic.com/public/wdbin/download/46f971e4fc4a32b68ad5d7dade38a7d2 \
-    downloadURL=$downloadURL \
+            appNewVersion=2.6.25 \
-    appNewVersion=$appNewVersion \
+            expectedTeamID=TZ824L8Y37 \
-    expectedTeamID=VRXQSNCL5W \
+            BLOCKING_PROCESS_ACTION=quit \
-    BLOCKING_PROCESS_ACTION=prompt_user \
+            NOTIFY=all
-    LOGGING=REQ \
-    NOTIFY=all || true)"
 
-# Check result
+# ${destFile} ${what} BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent
-exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+if [ $? != 0 ]; then
-if [[ ${exitStatus} -eq 0 ]] ; then
+# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
-    echo -e "${what} succesfully installed.\n"
+    echo "Error installing ${what}. Exit code $?"
-else
+    caffexit $?
-    echo -e "Error installing ${what}. Exit code ${exitStatus}\n"
-    #printlog "$cmdOutput"
-    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
-    echo "$errorOutput"
-   	caffexit $exitStatus
 fi
 
 echo "[$(DATE)][LOG-END]"

README.md

@@ -2,7 +2,7 @@
 
 _The one installer script to rule them all._
 
-![](https://img.shields.io/github/v/release/Installomator/Installomator) ![](https://img.shields.io/github/downloads/Installomator/Installomator/latest/total) ![](https://img.shields.io/badge/macOS-10.14%2B-success) ![](https://img.shields.io/github/license/Installomator/Installomator)
+![](https://img.shields.io/github/v/release/scriptingosx/Installomator) ![](https://img.shields.io/github/downloads/scriptingosx/Installomator/latest/total) ![](https://img.shields.io/badge/macOS-10.14%2B-success) ![](https://img.shields.io/github/license/scriptingosx/Installomator)
 
 This script is in the “we find it useful, it is working for us” stage.
 
@@ -13,12 +13,12 @@ We have put a lot of work into making it stable and safe, but we cannot - of cou
 ## Authors
 
 Intallomator was originally inspired by the download scripts from William Smith and Sander Schram, and created by:
-- [Armin Briegel - @scriptingosx](https://github.com/scriptingosx)
+    Armin Briegel - @scriptingosx
 
-Later on a few more members came on the project:
+Later on a few more contributers came on the project:
-- Isaac Ordonez - @issacatmann
+    Isaac Ordonez - @issacatmann
-- [Søren Theilgaard - @Theile](https://github.com/Theile)
+    Søren Theilgaard - @Theile
-- [Adam Codega - @acodega](https://github.com/acodega)
+    Adam Codega - @acodega
 
  And with numerous contributions from many others.
 

fragments/functions.sh

@@ -156,11 +156,11 @@ 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" \
-        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*$archiveName.*")
+    | awk -F '"' "/browser_download_url/ && /$archiveName\"/ { print \$4; exit }")
     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" \
-        downloadURL=https://github.com$(curl -sL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -o "\/$gitusername\/$gitreponame.*\.$filetype")
+    | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
     fi
     if [ -z "$downloadURL" ]; then
         cleanupAndExit 9 "could not retrieve download URL for $gitusername/$gitreponame" ERROR
@@ -176,8 +176,7 @@ 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=""
@@ -200,16 +199,6 @@ 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
@@ -253,8 +242,8 @@ getAppVersion() {
 #        printlog "App(s) found: ${applist}" DEBUG
 #        applist=$(mdfind "kind:application AND name:$appName" -0 )
     fi
-    if [[ -z $applist ]]; then
+    if [[ -z applist ]]; then
-        printlog "No previous app found" WARN
+        printlog "No previous app found" INFO
     else
         printlog "App(s) found: ${applist}" INFO
     fi
@@ -276,7 +265,7 @@ getAppVersion() {
             if [[ -d "$installedAppPath"/Contents/_MASReceipt ]];then
                 printlog "Installed $appName is from App Store, use “IGNORE_APP_STORE_APPS=yes” to replace."
                 if [[ $IGNORE_APP_STORE_APPS == "yes" ]]; then
-                    printlog "Replacing App Store apps, no matter the version" WARN
+                    printlog "Replacing App Store apps, no matter the version"
                     appversion=0
                 else
                     cleanupAndExit 1 "App previously installed from App Store, and we respect that" ERROR

fragments/header.sh

@@ -238,7 +238,7 @@ IGNORE_DND_APPS=""
 # - updateToolArguments:
 #   When Installomator detects an existing installation of the application,
 #   and the updateTool variable is set
-#       $updateTool $updateArguments
+#      $updateTool $updateArguments
 #   Will be run instead of of downloading and installing a complete new version.
 #   Use this when the updateTool does differential and optimized downloads.
 #   e.g. msupdate on various Microsoft labels
@@ -253,7 +253,7 @@ IGNORE_DND_APPS=""
 #   We need to define `name` for the installed app (to be version checked), as well as
 #   `installerTool` for the installer app (if named differently than `name`. Installomator
 #   will add the path to the folder/disk image with the binary, and it will be called like this:
-#       $CLIInstaller $CLIArguments
+     `$CLIInstaller $CLIArguments`
 #   For most installations `CLIInstaller` should contain the `installerTool` for the CLI call
 #   (if it’s the same).
 #   We can support a whole range of other software titles by implementing this.

fragments/labels/1password8.sh

@@ -1,15 +0,0 @@
-1password8)
-    name="1Password 8"
-    appName="1Password.app"
-    type="zip"
-    if [[ $(arch) == "arm64" ]]; then
-        archiveName="1Password-latest-aarch64.zip"
-        downloadURL="https://downloads.1password.com/mac/1Password-latest-aarch64.zip"
-    elif [[ $(arch) == "i386" ]]; then
-        archiveName="1Password-latest-x86_64.zip"
-        downloadURL="https://downloads.1password.com/mac/1Password-latest-x86_64.zip"
-    fi
-    expectedTeamID="2BUA8C4S2C"
-    blockingProcesses=( "1Password Extension Helper" "1Password 7" "1Password" "1Password (Safari)" "1PasswordNativeMessageHost" "1PasswordSafariAppExtension" )
-    #forcefulQuit=YES
-    ;;

fragments/labels/adobecreativeclouddesktop.sh

@@ -2,11 +2,10 @@ 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 "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'osx10')][contains(text(),'Download')]/@href)" - 2> /dev/null)
+        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)
     elif [[ $(arch) == "i386" ]]; then
-        downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'macarm64')][contains(text(),'Download')]/@href)" - 2> /dev/null)
+        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)
     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/adobereaderdc-update.sh

@@ -1,7 +1,7 @@
 adobereaderdc-update)
     name="Adobe Acrobat Reader DC"
     type="pkgInDmg"
-    downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
+    downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo http://ardownload.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDCUpd"$adobecurrent"_MUI.dmg)
     appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt)
     #appNewVersion=$(curl -s -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" https://get.adobe.com/reader/ | grep ">Version" | sed -E 's/.*Version 20([0-9.]*)<.*/\1/g') # credit: Søren Theilgaard (@theilgaard)
     expectedTeamID="JQ525L2MZD"

fragments/labels/adobereaderdc.sh

@@ -3,8 +3,7 @@ adobereaderdc-install)
     name="Adobe Acrobat Reader DC"
     type="pkgInDmg"
     packageID="com.adobe.acrobat.DC.reader.app.pkg.MUI"
-    #downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\]",' | head -n 1 | cut -d \" -f 4)
+    downloadURL=$(curl --silent --fail -H "Sec-Fetch-Site: same-origin" -H "Accept-Encoding: gzip, deflate, br" -H "Accept-Language: en-US;q=0.9,en;q=0.8" -H "DNT: 1" -H "Sec-Fetch-Mode: cors" -H "X-Requested-With: XMLHttpRequest" -H "Referer: https://get.adobe.com/reader/enterprise/" -H "Accept: */*" "https://get.adobe.com/reader/webservices/json/standalone/?platform_type=Macintosh&platform_dist=OSX&platform_arch=x86-32&language=English&eventname=readerotherversions" | grep -Eo '"download_url":.*?[^\]",' | head -n 1 | cut -d \" -f 4)
-    downloadURL=$(adobecurrent=`curl --fail --silent https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt | tr -d '.'` && echo https://ardownload2.adobe.com/pub/adobe/reader/mac/AcrobatDC/"$adobecurrent"/AcroRdrDC_"$adobecurrent"_MUI.dmg)
     appNewVersion=$(curl -s https://armmf.adobe.com/arm-manifests/mac/AcrobatDC/reader/current_version.txt)
     #appNewVersion=$(curl -s -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15)" https://get.adobe.com/reader/ | grep ">Version" | sed -E 's/.*Version 20([0-9.]*)<.*/\1/g') # credit: Søren Theilgaard (@theilgaard)
     expectedTeamID="JQ525L2MZD"

fragments/labels/amazoncorretto8jdk.sh

@@ -1,12 +1,7 @@
 amazoncorretto8jdk)
 name="Amazon Corretto 8 JDK"
 type="pkg"
-	if [[ $(arch) == "arm64" ]]; then
+	downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg"
-		downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-aarch64-macos-jdk.pkg"
+	appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
-		appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
-	elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://corretto.aws/downloads/latest/amazon-corretto-8-x64-macos-jdk.pkg"
-        appNewVersion=$(curl -s https://raw.githubusercontent.com/corretto/corretto-8/develop/CHANGELOG.md | grep "## Corretto version" | head -n 1 | awk '{ print $4; exit}')
-    fi
 expectedTeamID="94KV3E626L"
 ;;

fragments/labels/androidstudio.sh

@@ -1,13 +0,0 @@
-androidstudio)
-    name="Android Studio"
-    type="dmg"
-    if [[ $(arch) == arm64 ]]; then
-	 downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i arm.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1)
-	 appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' )
-    elif [[ $(arch) == i386 ]]; then
-     downloadURL=$(curl -fsL "https://developer.android.com/studio#downloads" | grep -i mac.dmg | head -2 | grep -o -i -E "https.*" | cut -d '"' -f1)
-	 appNewVersion=$( echo "${downloadURL}" | head -1 | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\.[0-9]*\).*$/\1/' )
-	fi
-    expectedTeamID="EQHXZ8M8AV"
-    blockingProcesses=( androidstudio )
-    ;;

fragments/labels/atextlegacy.sh

@@ -1,7 +0,0 @@
-atextlegacy)
-     # credit: Gabe Marchan (gabemarchan.com - @darklink87)
-     name="aText"
-     type="dmg"
-     downloadURL="https://trankynam.com/atext/downloads/aTextLegacy.dmg"
-     expectedTeamID="KHEMQ2FD9E"
-     ;;

fragments/labels/blender.sh

@@ -1,11 +1,7 @@
 blender)
     name="blender"
     type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
+    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)
-        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

@@ -1,12 +0,0 @@
-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/camtasia.sh

@@ -1,8 +1,6 @@
-camtasia|\
+camtasia)
-camtasia2021)
+    name="Camtasia 2020"
-    name="Camtasia 2021"
     type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Camtasia (Mac) 2021" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
+    downloadURL=https://download.techsmith.com/camtasiamac/releases/Camtasia.dmg
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Camtasia (Mac) 2021" | sed -e 's/.*Camtasia (Mac) //' -e 's/<\/td>.*//')
     expectedTeamID="7TQL462TU8"
     ;;

fragments/labels/camtasia2019.sh

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

fragments/labels/camtasia2020.sh

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

fragments/labels/citrixworkspace.sh

@@ -3,6 +3,6 @@ citrixworkspace)
     name="Citrix Workspace"
     type="pkgInDmg"
     downloadURL="https:"$(curl -s -L "https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html#ctx-dl-eula-external" | grep "dmg?" | sed "s/.*rel=.\(.*\)..id=.*/\1/") # http://downloads.citrix.com/18823/CitrixWorkspaceApp.dmg?__gda__=1605791892_edc6786a90eb5197fb226861a8e27aa8
-    appNewVersion=$(curl -fs https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html | grep "<p>Version" | head -1 | awk '{print $2}' | cut -d "." -f 1-3)
+    appNewVersion=$(curl -fs https://www.citrix.com/downloads/workspace-app/mac/workspace-app-for-mac-latest.html | grep "<p>Version" | head -1 | cut -d " " -f1 | cut -d ";" -f2 | cut -d "." -f 1-3)
     expectedTeamID="S272Y5R93J"
     ;;

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 -A6 -i "macos" | grep -i "FileNumber" | tr '"' "\n" | grep -i "FileNumber" )"
+    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)
-    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/clue.sh

@@ -1,9 +0,0 @@
-clue)
-    #For personal use and students
-    name="Clue"
-    type="dmg"
-    downloadURL=$(curl -fsL https://clue.no/en/download | grep "For personal use and students:" | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\..*/\1/g')"
-    versionKey="CFBundleVersion"
-    expectedTeamID="3NX6B9TB2F"
-    ;;

fragments/labels/cluefull.sh

@@ -1,9 +0,0 @@
-cluefull)
-    #For companies and schools
-    name="Clue"
-    type="dmg"
-    downloadURL=$(curl -fsL https://clue.no/en/download | grep "For companies and schools:" | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion="$(echo "${downloadURL}" | sed -E 's/.*Clue*([0-9.]*)\F.*/\1/g')"
-    versionKey="CFBundleVersion"
-    expectedTeamID="3NX6B9TB2F"
-    ;;

fragments/labels/craftmanagerforsketch.sh

@@ -1,7 +0,0 @@
-craftmanagerforsketch)
-    name="CraftManager"
-    type="zip"
-    downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip"
-    appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2)
-    expectedTeamID="VRXQSNCL5W"
-    ;;

fragments/labels/displaylinkmanager.sh

@@ -1,8 +0,0 @@
-displaylinkmanager)
-    name="DisplayLink Manager"
-    type="pkg"
-    #packageID="com.displaylink.displaylinkmanagerapp"
-    downloadURL=https://www.synaptics.com$(redirect=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep 'class="download-link">Download' | head -n 1 | sed 's/.*href="//' | sed 's/".*//') && curl -sfL "https://www.synaptics.com$redirect" | grep Accept | head -n 1 | sed 's/.*href="//' | sed 's/".*//')
-    appNewVersion=$(curl -sfL https://www.synaptics.com/products/displaylink-graphics/downloads/macos | grep "Release:" | head -n 1 | cut -d ' ' -f2)
-    expectedTeamID="73YQY62QM3"
-    ;;

fragments/labels/drawio.sh

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

fragments/labels/dropbox.sh

@@ -2,6 +2,5 @@ dropbox)
     name="Dropbox"
     type="dmg"
     downloadURL="https://www.dropbox.com/download?plat=mac&full=1"
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | sed -E 's/.*%20([0-9.]*)\.dmg/\1/g')
     expectedTeamID="G7HH3F8CAK"
     ;;

fragments/labels/duckduckgo.sh

@@ -1,10 +0,0 @@
-duckduckgo)
-    name="DuckDuckGo"
-    type="dmg"
-    #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg"
-    #downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2)
-    downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2)
-    #appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2)
-    appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/sparkle:shortVersionString)[1]' 2>/dev/null | cut -d ">" -f2 | cut -d "<" -f1)
-    expectedTeamID="HKE973VLUW"
-    ;;

fragments/labels/duodevicehealth.sh

@@ -1,9 +0,0 @@
-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/egnyte.sh

@@ -3,7 +3,6 @@ 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/egnytewebedit.sh

@@ -1,9 +0,0 @@
-egnytewebedit)
-    name="EgnyteWebEdit"
-    type="pkg"
-    downloadURL="https://egnyte-cdn.egnyte.com/webedit/mac/en-us/latest/EgnyteWebEdit.pkg"
-    expectedTeamID="FELUD555VC"
-    appName="Egnyte WebEdit.app"
-    blockingProcesses=( NONE )
-    ;;
-    

fragments/labels/filezilla.sh

@@ -1,10 +0,0 @@
-filezilla)
-    name="FileZilla"
-    type="tbz"
-    packageID="org.filezilla-project.filezilla"
-    downloadURL=$(curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '"' '{print $2}' )
-    appNewVersion=$( curl -fsL https://filezilla-project.org/download.php\?show_all=1 | grep macosx | head -n 1 | awk -F '_' '{print $2}' )
-    expectedTeamID="5VPGKXL75N"
-    blockingProcesses=( NONE )
-    ;;
-

fragments/labels/firefox.sh

@@ -2,9 +2,7 @@ firefox)
     name="Firefox"
     type="dmg"
     downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
-    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    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)
-    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,9 +2,7 @@ firefox_da)
     name="Firefox"
     type="dmg"
     downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=da"
-    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    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)
-    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

@@ -3,25 +3,21 @@ firefox_intl)
     # and install corrosponding version of Firefox
     name="Firefox"
     type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
+    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for $name."
+    printlog "Found language $userLanguage to be used for Firefox."
-    releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt"
+    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
+        userLanguage=$(echo $userLanguage | cut -c 1-2)
-        if [ ${#userLanguage} -eq 2 ]; then
+        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
-            break
+            userLanguage="en_US"
         fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx"
     fi
-    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    printlog "Using language $userLanguage for download."
-    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
+    downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=$userLanguage"
+    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
+        printlog "Download not found for that language. Using en-US"
+        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
+    fi
+    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
     ;;

fragments/labels/firefoxesr.sh

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

fragments/labels/firefoxesr_intl.sh

@@ -3,25 +3,22 @@ firefoxesr_intl)
     # and install corrosponding version of Firefox ESR
     name="Firefox"
     type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
+    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for $name."
+    printlog "Found language $userLanguage to be used for Firefox."
-    releaseURL="https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt"
+    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep -o "=$userLanguage"; then
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
+        userLanguage=$(echo $userLanguage | cut -c 1-2)
-        if [ ${#userLanguage} -eq 2 ]; then
+        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep "=$userLanguage"; then
-            break
+            userLanguage="en_US"
         fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx"
     fi
-    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    printlog "Using language $userLanguage for download."
-    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
+    downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=$userLanguage"
+    # https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx&lang=en-US
+    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
+        printlog "Download not found for that language. Using en-US"
+        downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
+    fi
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g')
     expectedTeamID="43AQ936H96"
     blockingProcesses=( firefox )
-    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
     ;;

fragments/labels/firefoxpkg.sh

@@ -2,8 +2,6 @@ firefoxpkg)
     name="Firefox"
     type="pkg"
     downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    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

@@ -1,25 +0,0 @@
-firefoxpkg_intl)
-    # This label will try to figure out the selected language of the user,
-    # and install corrosponding version of Firefox ESR
-    name="Firefox"
-    type="pkg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for Firefox." WARN
-    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
-        userLanguage=$(echo $userLanguage | cut -c 1-2)
-        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
-            userLanguage="en_US"
-        fi
-    fi
-    printlog "Using language $userLanguage for download." WARN
-    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=$userLanguage"
-    # https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US
-    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
-        printlog "Download not found for that language. Using en-US" WARN
-        downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    fi
-    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/flycut.sh

@@ -1,8 +0,0 @@
-flycut)
-    name="Flycut"
-    type="zip"
-    archiveName="Flycut.[0-9.]*.zip"
-    downloadURL="$(downloadURLFromGit TermiT Flycut)"
-    appNewVersion=$(versionFromGit TermiT Flycut )
-    expectedTeamID="S8JLSG5ES7"
-;;

fragments/labels/fontexplorer.sh

@@ -1,9 +0,0 @@
-fontexplorer)
-    name="FontExplorer X Pro"
-    type="dmg"
-    packageID="com.linotype.FontExplorerX"
-    downloadURL="http://www.fontexplorerx.com/download/free-trial/Mac/"
-    appNewVersion=$( curl -fsL http://fex.linotype.com/update/client/mac/pro/version.plist | grep string | tail -n 1 | sed 's/[^0-9.]//g' )
-    expectedTeamID="2V7G2B7WG4"
-    ;;
-

fragments/labels/forticlient_ztna.sh

@@ -0,0 +1,9 @@
+forticlient_ztna)
+    name="FortiClient ZTNA"
+    type="pkgInDmg"
+    pkgName="Install.mpkg"
+    packageID="com.fortinet.forticlient."
+    downloadURL="https://links.fortinet.com/forticlient/mac/fabricagent"
+    appNewVersion="$(curl -fsL "$downloadURL" --remote-header-name --remote-name -w "%{url_effective}\n" -r 0-0 | cut -d "_" -f2)"
+    expectedTeamID="AH4XFXJ7DK"
+    ;;

fragments/labels/googlechrome.sh

@@ -4,5 +4,4 @@ googlechrome)
     downloadURL="https://dl.google.com/chrome/mac/universal/stable/GGRO/googlechrome.dmg"
     appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
     expectedTeamID="EQHXZ8M8AV"
-    printlog "WARNING for ERROR: Label googlechrome should not be used. Instead use googlechromepkg as per recommendations from Google. It's not fully certain that the app actually gets updated here. googlechromepkg will have built in updates and make sure the client is updated in the future." REQ
     ;;

fragments/labels/googlechromeenterprise.sh

@@ -1,10 +0,0 @@
-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/googlechromepkg.sh

@@ -6,7 +6,6 @@ googlechromepkg)
     # https://support.google.com/chrome/a/answer/9915669
     #
     downloadURL="https://dl.google.com/chrome/mac/stable/accept_tos%3Dhttps%253A%252F%252Fwww.google.com%252Fintl%252Fen_ph%252Fchrome%252Fterms%252F%26_and_accept_tos%3Dhttps%253A%252F%252Fpolicies.google.com%252Fterms/googlechrome.pkg"
-    appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
     expectedTeamID="EQHXZ8M8AV"
     updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent"
     updateToolArguments=( -runMode oneshot -userInitiated YES )

fragments/labels/googledrive.sh

@@ -3,13 +3,8 @@ googledrivefilestream)
     # credit: Isaac Ordonez, Mann consulting (@mannconsulting)
     name="Google Drive File Stream"
     type="pkgInDmg"
-    if [[ $(arch) == "arm64" ]]; then
+    packageID="com.google.drivefs"
-       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/gpgsuite.sh

@@ -4,7 +4,6 @@ gpgsuite)
     type="pkgInDmg"
     pkgName="Install.pkg"
     downloadURL=$(curl -s https://gpgtools.org/ | grep https://releases.gpgtools.org/GPG_Suite- | grep Download | cut -d'"' -f4)
-    appNewVersion=$(echo $downloadURL | cut -d "-" -f 2 | cut -d "." -f 1-2)
     expectedTeamID="PKV8ZPD836"
     blockingProcesses=( "GPG Keychain" )
     ;;

fragments/labels/grammarly.sh

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

fragments/labels/hype.sh

@@ -1,9 +0,0 @@
-hype)
-    name="Hype4"
-    type="dmg"
-    packageID="com.tumult.Hype4"
-    downloadURL="https://static.tumult.com/hype/download/Hype.dmg"
-    appNewVersion=$( curl -fsL https://tumult.com/hype/download/all/ | grep Ongoing | awk -F '<' '{print $4}' | sed 's/[^0-9.]//g' )
-    expectedTeamID="8J356DM772"
-    blockingProcesses=( NONE )
-    ;;

fragments/labels/idrive.sh

@@ -1,9 +0,0 @@
-idrive)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDrive.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*(https.*dmg).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/version_mac.js | sed -E 's/.*mac_vernum\=\"Version\ ([0-9.]*).*/\1/g')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;

fragments/labels/idrivethin.sh

@@ -1,9 +0,0 @@
-idrivethin)
-    name="IDrive"
-    type="pkgInDmg"
-    pkgName="IDriveThin.pkg"
-    downloadURL=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thinclient-mac([^;]*).*/\1/g' | sed -E 's/.*(https.*dmg).*/\1/g')
-    appNewVersion=$(curl -fs https://static.idriveonlinebackup.com/downloads/idrivethin/thin_version.js | sed -E 's/.*thin\_mac\_ver\=\"Version\ ([0-9.]*).*/\1/g')
-    versionKey="CFBundleVersion"
-    expectedTeamID="JWDCNYZ922"
-    ;;

fragments/labels/imageoptim.sh

@@ -1,9 +0,0 @@
-imageoptim)
-    name="imageoptim"
-    type="tbz"
-    packageID="net.pornel.ImageOptim"
-    downloadURL="https://imageoptim.com/ImageOptim.tbz2"
-    appNewVersion=$( curl -fsL https://imageoptim.com/appcast.xml | grep "title" | tail -n 1 | sed 's/[^0-9.]//g' )
-    expectedTeamID="59KZTZA4XR"
-    blockingProcesses=( NONE )
-    ;;

fragments/labels/ipswupdater.sh

@@ -1,8 +0,0 @@
-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/linear.sh

@@ -1,15 +0,0 @@
-linear)
-    name="Linear"
-    type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
-        downloadURL="https://desktop.linear.app/mac/dmg/arm64"
-    elif [[ $(arch) == "i386" ]]; then
-        downloadURL="https://desktop.linear.app/mac/dmg"
-    fi
-    appNewVersion=$(curl -sIkL $downloadURL | sed -r '/filename=/!d;s/.*filename=(.*)$/\1/' | awk '{print $2}')
-    expectedTeamID="7VZ2S3V9RV"
-    versionKey="CFBundleShortVersionString"
-    appName="Linear.app"
-    blockingProcesses=( "Linear" )
-    ;;
-    

fragments/labels/logitechoptions.sh

@@ -1,6 +1,5 @@
-logioptions|\
 logitechoptions)
-    name="Logi Options"
+    name="Logitech Options"
     type="pkgInZip"
     #downloadURL=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -oie "https.*/.*/options/.*\.zip" | head -1)
     downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/options/options_installer.zip"

fragments/labels/macoslaps.sh

@@ -1,8 +0,0 @@
-macoslaps)
-    name="macOSLAPS"
-    type="pkg"
-    packageID="edu.psu.macOSLAPS"
-    downloadURL="$(downloadURLFromGit joshua-d-miller macOSLAPS)"
-    appNewVersion="$(versionFromGit joshua-d-miller macOSLAPS)"
-    expectedTeamID="9UYK4F9BSM"
-    ;;

fragments/labels/marathon.sh

@@ -2,7 +2,6 @@ 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,7 +2,6 @@ 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,7 +2,6 @@ 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/mindmanager.sh

@@ -1,7 +0,0 @@
-mindmanager)
-    name="MindManager"
-    type="dmg"
-    downloadURL="https://www.mindmanager.com/mm-mac-dmg"
-    appNewVersion="$(curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*_Mac_*([0-9.]*)\..*/\1/g')"
-    expectedTeamID="ZF6ZZ779N5"
-    ;;

fragments/labels/miro.sh

@@ -2,10 +2,6 @@ miro)
     # credit: @matins
     name="Miro"
     type="dmg"
-    if [[ $(arch) == arm64 ]]; then
+    downloadURL="https://desktop.miro.com/platforms/darwin/Miro.dmg"
-        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

@@ -1,8 +0,0 @@
-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/nordlayer.sh

@@ -1,7 +0,0 @@
-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,10 +4,9 @@ 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/onlyofficedesktop.sh

@@ -1,11 +1,6 @@
 onlyofficedesktop)
     name="ONLYOFFICE"
     type="dmg"
-    if [[ $(arch) == "arm64" ]]; then
+    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/distrib/onlyoffice/ONLYOFFICE.dmg"
-    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/arm/distrib/ONLYOFFICE.dmg"
-    elif [[ $(arch) == "i386" ]]; then
-    downloadURL="https://download.onlyoffice.com/install/desktop/editors/mac/x86_64/distrib/ONLYOFFICE.dmg"
-    fi
-    appNewVersion=$(versionFromGit ONLYOFFICE DesktopEditors)
     expectedTeamID="2WH24U26GJ"
     ;;

fragments/labels/pika.sh

@@ -1,9 +0,0 @@
-pika)
-    name="Pika"
-    type="dmg"
-    packageID="com.superhighfives.Pika"
-    downloadURL=$(downloadURLFromGit "superhighfives" "pika")
-    appNewVersion=$(versionFromGit "superhighfives" "pika")
-    expectedTeamID="TGHU37N6EX"
-    blockingProcesses=( NONE )
-    ;;

fragments/labels/postman.sh

@@ -1,12 +1,8 @@
 postman)
+    # credit: Mischa van der Bent
     name="Postman"
     type="zip"
-    if [[ $(arch) == "arm64" ]]; then
+    downloadURL="https://dl.pstmn.io/download/latest/osx"
-    	downloadURL="https://dl.pstmn.io/download/latest/osx_arm64"
+    appNewVersion=$(curl -Ifs https://dl.pstmn.io/download/latest/osx | grep "content-disposition:" | sed -n -e 's/^.*Postman-osx-//p' | sed 's/\.zip//' | sed $'s/[^[:print:]\t]//g' )
-		appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
-	elif [[ $(arch) == "i386" ]]; then
-		downloadURL="https://dl.pstmn.io/download/latest/osx_64"
-		appNewVersion=$(curl -fsL --head "${downloadURL}" | grep "content-disposition:" | sed 's/^.*[^0-9]\([0-9]*\.[0-9]*\.[0-9]*\).*$/\1/')
-	fi
     expectedTeamID="H7H8Q7M5CK"
     ;;

fragments/labels/prune.sh

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

fragments/labels/qgis-pr.sh

@@ -1,7 +0,0 @@
-qgis-pr)
-    name="QGIS"
-    type="dmg"
-    downloadURL="https://download.qgis.org/downloads/macos/qgis-macos-pr.dmg"
-    appNewVersion="$(curl -fs "https://www.qgis.org/da/_static/documentation_options.js" | grep -i version | cut -d "'" -f2)"
-    expectedTeamID="4F7N4UDA22"
-    ;;

fragments/labels/rancherdesktop.sh

@@ -1,13 +1,8 @@
 rancherdesktop)
-    name="Rancher Desktop"
+    name="Rancher.Desktop-1.0.0-mac"
     type="zip"
-    if [[ $(arch) == "arm64" ]]; then
+    archiveName="Rancher.Desktop-[0-9.]*-mac.zip"
-      archiveName="Rancher.Desktop-[0-9.]*-mac.aarch64.zip"
+    downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
-      downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
-    elif [[ $(arch) == "i386" ]]; then
-      archiveName="Rancher.Desktop-[0-9.]*-mac.x86_64.zip"
-      downloadURL="$(downloadURLFromGit rancher-sandbox rancher-desktop)"
-    fi
     appNewVersion="$(versionFromGit rancher-sandbox rancher-desktop)"
     expectedTeamID="2Q6FHJR3H3"
     appName="Rancher Desktop.app"

fragments/labels/remotedesktopmanagerenterprise.sh

@@ -1,8 +1,7 @@
 remotedesktopmanagerenterprise)
     name="Remote Desktop Manager"
     type="dmg"
-    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
     appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
     expectedTeamID="N592S9ASDB"
-    blockingProcesses=( "$name" )
     ;;

fragments/labels/remotedesktopmanagerfree.sh

@@ -1,7 +1,7 @@
 remotedesktopmanagerfree)
     name="Remote Desktop Manager Free"
     type="dmg"
-    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
     appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
     expectedTeamID="N592S9ASDB"
     ;;

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/shottr.sh

@@ -1,7 +0,0 @@
-shottr)
-    name="Shottr"
-    type="dmg"
-    downloadURL="https://shottr.cc/dl/Shottr-1.5.3.dmg"
-    appNewVersion=$( echo ${downloadURL} | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
-    expectedTeamID="2Y683PRQWN"
-    ;;

fragments/labels/sketch.sh

@@ -1,7 +1,7 @@
 sketch)
     name="Sketch"
     type="zip"
-    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | tr '"' "\n" | grep -E "https.*.zip")
+    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g')
     appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page
     expectedTeamID="WUGMZZ5K46"
     ;;

fragments/labels/slab.sh

@@ -1,12 +0,0 @@
-slab)
-    name="Slab"
-    type="dmg"
-    if [[ $(arch) == i386 ]]; then
-       archiveName="Slab-[0-9.]*-darwin-x64.dmg"
-    elif [[ $(arch) == arm64 ]]; then
-       archiveName="Slab-[0-9.]*-darwin-arm64.dmg"
-    fi
-    downloadURL=$(downloadURLFromGit slab desktop-releases)
-    appNewVersion=$(versionFromGit slab desktop-releases)
-    expectedTeamID="Q67SW996Z5"
-    ;;

fragments/labels/snagit.sh

@@ -1,8 +1,8 @@
 snagit|\
-snagit2022)
+snagit2021|\
-    name="Snagit 2022"
+snagit2020)
+    name="Snagit 2021"
     type="dmg"
-    downloadURL=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links" | grep -A 3 "Snagit (Mac) 2022" | sed 's/.*href="//' | sed 's/".*//' | grep .dmg)
+    downloadURL="https://download.techsmith.com/snagitmac/releases/Snagit.dmg"
-    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://support.techsmith.com/hc/en-us/articles/360004908652-Desktop-Product-Download-Links"  | grep "Snagit (Mac) 2022" | sed -e 's/.*Snagit (Mac) //' -e 's/<\/td>.*//')
     expectedTeamID="7TQL462TU8"
     ;;

fragments/labels/snagit2019.sh

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

fragments/labels/snagit2020.sh

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

fragments/labels/snagit2021.sh

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

fragments/labels/sonobus.sh

@@ -1,9 +0,0 @@
-sonobus)
-    name="Sonobus"
-    type="pkgInDmg"
-    html_page_source="$(curl -fs 'https://www.sonobus.net')"
-    downloadFile="$(echo "${html_page_source}" | xmllint --html --xpath "string(//a[contains(@href, 'mac.dmg')]/@href)" - 2> /dev/null)"
-    downloadURL="https://www.sonobus.net/$downloadFile"
-    appNewVersion="$(echo "${downloadFile}" | sed 's/releases\/sonobus-//' | sed 's/\-mac.dmg//' )"
-    expectedTeamID="XCS435894D"
-    ;;

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_thanks?target=mac#direct-downloads" | grep -io "https://download.*_mac.zip" | head -1)"
+    downloadURL="$(curl -fs https://www.sublimetext.com/download | grep -io "https://download.*_mac.zip")"
     appNewVersion=$(curl -fs https://www.sublimetext.com/download | grep -i -A 4 "id.*changelog" | grep -io "Build [0-9]*")
     expectedTeamID="Z6D26JE4Y4"
     ;;

fragments/labels/talkdeskcallbar.sh

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

fragments/labels/talkdeskcxcloud.sh

@@ -1,8 +0,0 @@
-talkdeskcxcloud)
-    name="Talkdesk"
-    type="dmg"
-    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/thunderbird_intl.sh

@@ -1,25 +0,0 @@
-thunderbird_intl)
-    # This label will try to figure out the selected language of the user,
-    # and install corrosponding version of Thunderbird
-    name="Thunderbird"
-    type="dmg"
-    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale | tr '_' '-')
-    printlog "Found language $userLanguage to be used for $name."
-    releaseURL="https://ftp.mozilla.org/pub/thunderbird/releases/latest/README.txt"
-    until curl -fs $releaseURL | grep -q "=$userLanguage"; do
-        if [ ${#userLanguage} -eq 2 ]; then
-            break
-        fi
-        printlog "No locale matching '$userLanguage', trying '${userLanguage:0:2}'"
-        userLanguage=${userLanguage:0:2}
-    done
-    printlog "Using language '$userLanguage' for download."
-    downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx&lang=$userLanguage"
-    if ! curl -sfL --output /dev/null -r 0-0 $downloadURL; then
-        printlog "Download not found for '$userLanguage', using default ('en-US')."
-        downloadURL="https://download.mozilla.org/?product=thunderbird-latest&os=osx"
-    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}')
-    expectedTeamID="43AQ936H96"
-    blockingProcesses=( thunderbird )
-    ;;

fragments/labels/ultimakercura.sh

@@ -1,8 +0,0 @@
-ultimakercura)
-    name="Ultimaker Cura"
-    type="dmg"
-    downloadURL="$(downloadURLFromGit Ultimaker Cura)"
-    archiveName="Ultimaker_Cura-[0-9].*-Darwin.dmg"
-    appNewVersion=$(versionFromGit Ultimaker Cura )
-    expectedTeamID="V4B3JXRRQS"
-    ;;

fragments/labels/unnaturalscrollwheels.sh

@@ -1,8 +0,0 @@
-unnaturalscrollwheels)
-    name="UnnaturalScrollWheels"
-    type="dmg"
-    downloadURL="$(downloadURLFromGit ther0n UnnaturalScrollWheels)"
-    appNewVersion="$(versionFromGit ther0n UnnaturalScrollWheels)"
-    expectedTeamID="D6H5W2T379"
-    blockingProcesses=( UnnaturalScrollWheels )
-    ;;

fragments/labels/wechat.sh

@@ -1,6 +0,0 @@
-wechat)
-    name="WeChat"
-    type="dmg"
-    downloadURL="https://dldir1.qq.com/weixin/mac/WeChatMac.dmg"
-    expectedTeamID="5A4RE8SF68"
-    ;;

fragments/labels/whatroute.sh

@@ -1,7 +0,0 @@
-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"
-    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"
+      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%20$appNewVersion%20Arm%2064.dmg"
+      downloadURL="https://1.as.dl.wireshark.org/osx/Wireshark%20Latest%20Arm%2064.dmg"
     fi
+    appNewVersion=$(curl -fs https://www.wireshark.org/download.html | grep -i "href.*_stable" | sed -E 's/.*\(([0-9.]*)\).*/\1/g')
     expectedTeamID="7Z6EMTD2C6"
     ;;

fragments/labels/xeroxworkcentre7800.sh

@@ -1,9 +0,0 @@
-xeroxworkcentre7800)
-    name="XeroxWorkCentre"
-    type="pkgInDmg"
-    appCustomVersion(){ lpinfo -m | grep 783 | tail -n 1 | awk -F ', ' '{print $2}' }
-    appNewVersion=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | grep .dmg | head -n 1 | awk -F '_' '{print $2}' )
-    downloadURL=$( curl -fsL "https://www.support.xerox.com/nl-nl/product/workcentre-7800-series/downloads?platform=macOSx11" | xmllint --html --format - 2>/dev/null | grep -o "https://.*XeroxDrivers.*.dmg" )
-    expectedTeamID="G59Y3XFNFR"
-    blockingProcesses=( NONE )
-;;

fragments/labels/zohoworkdrivegenie.sh

@@ -1,8 +0,0 @@
-zohoworkdrivegenie)
-    name="Zoho WorkDrive Genie"
-    type="dmg"
-    # https://www.zoho.com/workdrive/genie.html
-    downloadURL="https://www.zoho.com/workdrive/downloads/edit-tool/Zoho_WorkDrive_Genie.dmg"
-    CLIInstaller="Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie"
-    expectedTeamID="TZ824L8Y37"
-    ;;