Merge pull request #455 from Installomator/Theile-labels-2022-03

Theile labels 2022 03
2026-03-09 13:21:53 +00:00 · 2022-05-12 09:43:02 +02:00
parent c89f704817 744ce4949d
commit aa762ecee2
19 changed files with 235 additions and 112 deletions
--- a/script.sh
+++ b/script.sh
@@ -5,8 +5,28 @@ 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=$!
@@ -16,18 +36,14 @@ caffexit () {
    exit $1
 }

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

-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    caffexit 99
-fi
-
-for item in $what; do
-    #echo $item
-    ${destFile} ${item} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force
-    if [ $? != 0 ]; then
-    # This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
-        echo "[$(DATE)] Error installing ${item}. Exit code $?"
+for what in $whatList; do
+    #echo $what
+    # Install software using Installomator
+    cmdOutput="$(${destFile} ${what} LOGO=$LOGO $parameters LOGGING=WARN || true)"
+    # Check result
+    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    if [[ ${exitStatus} -ne 0 ]] ; then
+        echo -e "Error installing ${what}. Exit code ${exitStatus}"
+        #echo "$cmdOutput"
+        errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+        echo "$errorOutput"
        let errorCount++
    fi
 done
--- a/MDM/Installomator
+++ b/MDM/Installomator
@@ -1,9 +1,18 @@
 #!/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 &
@@ -14,30 +23,19 @@ caffexit () {
    exit $1
 }

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

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

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

 # 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 (0.7.0)/Installomator-0.7.0.pkg" -target /
+/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (9.1.0)/Installomator-9.1.pkg" -target /

 # Installation using Installomator
-what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed  separated with spaces
+whatList="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 "what" above with labels separated by space " ".
+# Fill the variable "whatList" 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 &
@@ -27,21 +46,17 @@ caffexit () {
 # Count errors
 errorCount=0

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

 vercomp () {
    if [[ $1 == $2 ]]; then
--- a/MDM/MDMMosyle
+++ b/MDM/MDMMosyle
@@ -1,10 +1,11 @@
 PKG_ID="com.scriptingosx.Installomator"
-TARGET_VERSION="8.0"
+TARGET_VERSION="9.1"
 URLDOWNLOAD="%MosyleCDNFile:blah-blah-blah%"
 ######################################################################
-# Installation using Installomator (enter the software to install separated with spaces in the "what"-variable)
-what="handbrake theunarchiver microsoftoffice365"
+# Installation using Installomator (enter the software to install separated with spaces in the "whatList"-variable)
+whatList="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
@@ -56,12 +57,17 @@ if [ ! -e "${destFile}" ]; then
    caffexit 99
 fi

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

-what="valuesfromarguments" # 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 &
@@ -13,29 +25,31 @@ caffexit () {
    exit $1
 }

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

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

-# ${destFile} ${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 $?
+# Check result
+exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+if [[ ${exitStatus} -eq 0 ]] ; then
+    echo -e "${what} succesfully installed.\n"
+else
+    echo -e "Error installing ${what}. Exit code ${exitStatus}\n"
+    #printlog "$cmdOutput"
+    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+    echo "$errorOutput"
+   	caffexit $exitStatus
 fi

 echo "[$(DATE)][LOG-END]"
--- a/fragments/labels/craftmanagerforsketch.sh
+++ b/fragments/labels/craftmanagerforsketch.sh
@@ -0,0 +1,7 @@
+craftmanagerforsketch)
+    name="CraftManager"
+    type="zip"
+    downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip"
+    appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2)
+    expectedTeamID="VRXQSNCL5W"
+    ;;
--- a/fragments/labels/dropbox.sh
+++ b/fragments/labels/dropbox.sh
@@ -2,5 +2,6 @@ dropbox)
    name="Dropbox"
    type="dmg"
    downloadURL="https://www.dropbox.com/download?plat=mac&full=1"
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | sed -E 's/.*%20([0-9.]*)\.dmg/\1/g')
    expectedTeamID="G7HH3F8CAK"
    ;;
--- a/fragments/labels/duckduckgo.sh
+++ b/fragments/labels/duckduckgo.sh
@@ -0,0 +1,10 @@
+duckduckgo)
+    name="DuckDuckGo"
+    type="dmg"
+    #downloadURL="https://staticcdn.duckduckgo.com/macos-desktop-browser/duckduckgo.dmg"
+    #downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[last()]' 2>/dev/null | cut -d '"' -f2)
+    downloadURL=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2)
+    #appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:version)[last()]' 2>/dev/null | cut -d '"' -f2)
+    appNewVersion=$(curl -fs https://staticcdn.duckduckgo.com/macos-desktop-browser/appcast.xml | xpath '(//rss/channel/item/sparkle:shortVersionString)[1]' 2>/dev/null | cut -d ">" -f2 | cut -d "<" -f1)
+    expectedTeamID="HKE973VLUW"
+    ;;
--- a/fragments/labels/firefox_intl.sh
+++ b/fragments/labels/firefox_intl.sh
@@ -4,17 +4,17 @@ firefox_intl)
    name="Firefox"
    type="dmg"
    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for Firefox."
+    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."
+    printlog "Using language $userLanguage for download." WARN
    downloadURL="https://download.mozilla.org/?product=firefox-latest&amp;os=osx&amp;lang=$userLanguage"
    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
-        printlog "Download not found for that language. Using en-US"
+        printlog "Download not found for that language. Using en-US" WARN
        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)
--- a/fragments/labels/firefoxesr_intl.sh
+++ b/fragments/labels/firefoxesr_intl.sh
@@ -4,18 +4,18 @@ firefoxesr_intl)
    name="Firefox"
    type="dmg"
    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
-    printlog "Found language $userLanguage to be used for Firefox."
+    printlog "Found language $userLanguage to be used for Firefox." WARN
    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep -o "=$userLanguage"; then
        userLanguage=$(echo $userLanguage | cut -c 1-2)
        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest-esr/README.txt" | grep "=$userLanguage"; then
            userLanguage="en_US"
        fi
    fi
-    printlog "Using language $userLanguage for download."
+    printlog "Using language $userLanguage for download." WARN
    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"
+        printlog "Download not found for that language. Using en-US" WARN
        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')
--- a/fragments/labels/firefoxpkg_intl.sh
+++ b/fragments/labels/firefoxpkg_intl.sh
@@ -0,0 +1,24 @@
+firefoxpkg_intl)
+    # This label will try to figure out the selected language of the user,
+    # and install corrosponding version of Firefox ESR
+    name="Firefox"
+    type="pkg"
+    userLanguage=$(runAsUser defaults read .GlobalPreferences AppleLocale)
+    printlog "Found language $userLanguage to be used for Firefox." WARN
+    if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep -o "=$userLanguage"; then
+        userLanguage=$(echo $userLanguage | cut -c 1-2)
+        if ! curl -fs "https://ftp.mozilla.org/pub/firefox/releases/latest/README.txt" | grep "=$userLanguage"; then
+            userLanguage="en_US"
+        fi
+    fi
+    printlog "Using language $userLanguage for download." WARN
+    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=$userLanguage"
+    # https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US
+    if ! curl -sfL --output /dev/null -r 0-0 "$downloadURL" ; then
+        printlog "Download not found for that language. Using en-US" WARN
+        downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
+    fi
+    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location | cut -d "/" -f7)
+    expectedTeamID="43AQ936H96"
+    blockingProcesses=( firefox )
+    ;;
--- a/fragments/disabled/mightymike.sh
+++ b/fragments/disabled/mightymike.sh
--- a/fragments/labels/qgis-pr.sh
+++ b/fragments/labels/qgis-pr.sh
@@ -0,0 +1,7 @@
+qgis-pr)
+    name="QGIS"
+    type="dmg"
+    downloadURL="https://download.qgis.org/downloads/macos/qgis-macos-pr.dmg"
+    appNewVersion="$(curl -fs "https://www.qgis.org/da/_static/documentation_options.js" | grep -i version | cut -d "'" -f2)"
+    expectedTeamID="4F7N4UDA22"
+    ;;
--- a/fragments/labels/remotedesktopmanagerenterprise.sh
+++ b/fragments/labels/remotedesktopmanagerenterprise.sh
@@ -1,7 +1,8 @@
 remotedesktopmanagerenterprise)
    name="Remote Desktop Manager"
    type="dmg"
-    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacbin | grep -oe "http.*\.dmg" | head -1)
    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
    expectedTeamID="N592S9ASDB"
+    blockingProcesses=( "$name" )
    ;;
--- a/fragments/labels/remotedesktopmanagerfree.sh
+++ b/fragments/labels/remotedesktopmanagerfree.sh
@@ -1,7 +1,7 @@
 remotedesktopmanagerfree)
    name="Remote Desktop Manager Free"
    type="dmg"
-    downloadURL=$(curl -fs https://remotedesktopmanager.com/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
+    downloadURL=$(curl -fs https://devolutions.net/remote-desktop-manager/home/thankyou/rdmmacfreebin | grep -oe "http.*\.dmg" | head -1)
    appNewVersion=$(echo "$downloadURL" | sed -E 's/.*\.Mac\.([0-9.]*)\.dmg/\1/g')
    expectedTeamID="N592S9ASDB"
    ;;
--- a/fragments/labels/sketch.sh
+++ b/fragments/labels/sketch.sh
@@ -1,7 +1,7 @@
 sketch)
    name="Sketch"
    type="zip"
-    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | sed -E 's/.*href=\"(.*)\".?/\1/g')
+    downloadURL=$(curl -sf https://www.sketch.com/downloads/mac/ | grep 'href="https://download.sketch.com' | tr '"' "\n" | grep -E "https.*.zip")
    appNewVersion=$(curl -fs https://www.sketch.com/updates/ | grep "Sketch Version" | head -1 | sed -E 's/.*Version ([0-9.]*)<.*/\1/g') # version from update page
    expectedTeamID="WUGMZZ5K46"
    ;;
--- a/fragments/labels/zohoworkdrivegenie.sh
+++ b/fragments/labels/zohoworkdrivegenie.sh
@@ -0,0 +1,8 @@
+zohoworkdrivegenie)
+    name="Zoho WorkDrive Genie"
+    type="dmg"
+    # https://www.zoho.com/workdrive/genie.html
+    downloadURL="https://www.zoho.com/workdrive/downloads/edit-tool/Zoho_WorkDrive_Genie.dmg"
+    CLIInstaller="Zoho WorkDrive Genie.app/Contents/MacOS/Zoho WorkDrive Genie"
+    expectedTeamID="TZ824L8Y37"
+    ;;
--- a/fragments/version.sh
+++ b/fragments/version.sh
@@ -1 +1 @@
-9.2beta
+10dev
@@ -1 +1 @@
 .2beta
 dev