Merge pull request #565 from Installomator/Barco-ClickShare

Barco click share
Merge pull request #560 from Installomator/Theile-labels-10
2026-03-10 05:11:57 +00:00 · 2022-06-22 15:23:06 +02:00 · 2022-06-22 15:19:24 +02:00 · 2022-06-22 15:13:27 +02:00 · 2022-06-22 15:05:50 +02:00 · 2022-06-22 15:05:20 +02:00
25 changed files with 103 additions and 17 deletions
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -81,6 +81,7 @@ LOGO=appstore
 #   - mosylem       Mosyle Manager (Education)
 #   - addigy        Addigy
 #   - microsoft     Microsoft Endpoint Manager (Intune)
+#   - ws1           Workspace ONE (AirWatch)
 # path can also be set in the command call, and if file exists, it will be used.
 # Like 'LOGO="/System/Applications/App\ Store.app/Contents/Resources/AppIcon.icns"'
 # (spaces have to be escaped).
@@ -367,10 +368,13 @@ displaydialogContinue() { # $1: message $2: title
 displaynotification() { # $1: message $2: title
    message=${1:-"Message"}
    title=${2:-"Notification"}
+    hubcli="/usr/local/bin/hubcli"
    manageaction="/Library/Application Support/JAMF/bin/Management Action.app/Contents/MacOS/Management Action"

    if [[ -x "$manageaction" ]]; then
         "$manageaction" -message "$message" -title "$title"
+    elif [[ -x "$hubcli" ]]; then
+         "$hubcli" notify -t "$title" -i "$message" -c "Dismiss"
    else
        runAsUser osascript -e "display notification \"$message\" with title \"$title\""
    fi
@@ -5264,6 +5268,11 @@ case $LOGO in
        LOGO="/Library/Intune/Microsoft Intune Agent.app/Contents/Resources/AppIcon.icns"
        if [[ -z $MDMProfileName ]]; then; MDMProfileName="Management Profile"; fi
        ;;
+    ws1)
+        # Workspace ONE
+        LOGO="/Applications/Workspace ONE Intelligent Hub.app/Contents/Resources/AppIcon.icns"
+        if [[ -z $MDMProfileName ]]; then; MDMProfileName="Device Manager"; fi
+        ;;
 esac
 if [[ ! -a "${LOGO}" ]]; then
    if [[ $(sw_vers -buildVersion) > "19" ]]; then
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -22,7 +22,7 @@ cleanupAndExit() { # $1 = exit code, $2 message, $3 level
        printlog "$2" $3
    fi
    printlog "################## End Installomator, exit code $1 \n" REQ
-    
+
    # if label is wrong and we wanted name of the label, then return ##################
    if [[ $RETURN_LABEL_NAME -eq 1 ]]; then
        1=0 # If only label name should be returned we exit without any errors
@@ -199,6 +199,16 @@ xpath() {
 	fi
 }

+# from @Pico: https://macadmins.slack.com/archives/CGXNNJXJ9/p1652222365989229?thread_ts=1651786411.413349&cid=CGXNNJXJ9
+getJSONValue() {
+	# $1: JSON string OR file path to parse (tested to work with up to 1GB string and 2GB file).
+	# $2: JSON key path to look up (using dot or bracket notation).
+	printf '%s' "$1" | /usr/bin/osascript -l 'JavaScript' \
+		-e "let json = $.NSString.alloc.initWithDataEncoding($.NSFileHandle.fileHandleWithStandardInput.readDataToEndOfFile$(/usr/bin/uname -r | /usr/bin/awk -F '.' '($1 > 18) { print "AndReturnError(ObjC.wrap())" }'), $.NSUTF8StringEncoding)" \
+		-e 'if ($.NSFileManager.defaultManager.fileExistsAtPath(json)) json = $.NSString.stringWithContentsOfFileEncodingError(json, $.NSUTF8StringEncoding, ObjC.wrap())' \
+		-e "const value = JSON.parse(json.js)$([ -n "${2%%[.[]*}" ] && echo '.')$2" \
+		-e 'if (typeof value === "object") { JSON.stringify(value, null, 4) } else { value }'
+}

 getAppVersion() {
    # modified by: Søren Theilgaard (@theilgaard) and Isaac Ordonez
--- a/fragments/labels/adobecreativeclouddesktop.sh
+++ b/fragments/labels/adobecreativeclouddesktop.sh
@@ -2,10 +2,11 @@ adobecreativeclouddesktop)
    name="Adobe Creative Cloud"
    #appName="Install.app"
    type="dmg"
+    adobeurl="https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html"
    if [[ $(arch) == "arm64" ]]; then
-        downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*macarm64.*dmg" | cut -d '"' -f1 | head -1)
+        downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'osx10')][contains(text(),'Download')]/@href)" - 2> /dev/null)
    elif [[ $(arch) == "i386" ]]; then
-        downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*osx10.*dmg" | cut -d '"' -f1 | head -1)
+        downloadURL=$(curl -fs "$adobeurl" | xmllint -html -xpath "string(//a[contains(@href,'macarm64')][contains(text(),'Download')]/@href)" - 2> /dev/null)
    fi
    #downloadURL=$(curl -fs "https://helpx.adobe.com/download-install/kb/creative-cloud-desktop-app-download.html" | grep -o "https*.*dmg" | head -1)
    appNewVersion=$(curl -fs "https://helpx.adobe.com/creative-cloud/release-note/cc-release-notes.html" | grep "mandatory" | head -1 | grep -o "Version *.* released" | cut -d " " -f2)
--- a/fragments/labels/blender.sh
+++ b/fragments/labels/blender.sh
@@ -1,7 +1,11 @@
 blender)
    name="blender"
    type="dmg"
-    downloadURL=$(redirect=$(curl -sfL https://www.blender.org/download/ | sed 's/.*href="//' | sed 's/".*//' | grep .dmg) && curl -sfL "$redirect" | sed 's/.*href="//' | sed 's/".*//' | grep -m1 .dmg)
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL=$(curl -sfL "https://www.blender.org/download/" | xmllint --html --format - 2>/dev/null | grep -o "https://.*blender.*arm64.*.dmg" | sed '2p;d' | sed 's/www.blender.org\/download/download.blender.org/g')
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL=$(curl -sfL "https://www.blender.org/download/" | xmllint --html --format - 2>/dev/null | grep -o "https://.*blender.*x64.*.dmg" | sed '2p;d' | sed 's/www.blender.org\/download/download.blender.org/g')
+    fi
    appNewVersion=$( echo "${downloadURL}" | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)-.*/\1/g' )
    expectedTeamID="68UA947AUU"
    ;;
--- a/fragments/labels/bluejeanswithaudiodriver.sh
+++ b/fragments/labels/bluejeanswithaudiodriver.sh
@@ -0,0 +1,12 @@
+bluejeanswithaudiodriver)
+    name="BlueJeans"
+    type="pkg"
+    if [[ $(arch) == "arm64" ]]; then
+        downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeans.*Installer.*arm.*.pkg" )
+    elif [[ $(arch) == "i386" ]]; then
+        downloadURL=$(curl -fs "https://www.bluejeans.com/downloads" | xmllint --html --format - 2>/dev/null | grep -o "https://.*BlueJeansInstaller.*x86.*.dmg" | sed 's/dmg/pkg/g')
+    fi
+    appNewVersion=$(echo $downloadURL | cut -d '/' -f6)
+    choiceChangesXML='<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"><plist version="1.0"><array><dict><key>attributeSetting</key><integer>1</integer><key>choiceAttribute</key><string>selected</string><key>choiceIdentifier</key><string>com.tatvikmohit.BlueJeans-Audio</string></dict></array></plist>'
+    expectedTeamID="HE4P42JBGN"
+    ;;
--- a/fragments/labels/clickshare.sh
+++ b/fragments/labels/clickshare.sh
@@ -1,7 +1,7 @@
 clickshare)
-    # credit: Søren Theilgaard (@theilgaard)
    name="ClickShare"
    type="appInDmgInZip"
-    downloadURL=https://www.barco.com$(curl -fs "https://www.barco.com/en/clickshare/app" | grep -E -o '(\/\S*Download\?FileNumber=R3306192\S*ShowDownloadPage=False)' | tail -1)
+    downloadURL="https://www.barco.com$( curl -fs "https://www.barco.com/en/clickshare/app" | grep -A6 -i "macos" | grep -i "FileNumber" | tr '"' "\n" | grep -i "FileNumber" )"
+    appNewVersion="$(eval "$( echo $downloadURL | sed -E 's/.*(MajorVersion.*BuildVersion=[0-9]*).*/\1/' | sed 's/&amp//g' )" ; ((MajorVersion++)) ; ((MajorVersion--)); ((MinorVersion++)) ; ((MinorVersion--)); ((PatchVersion++)) ; ((PatchVersion--)); ((BuildVersion++)) ; ((BuildVersion--)); echo "${MajorVersion}.${MinorVersion}.${PatchVersion}-b${BuildVersion}")"
    expectedTeamID="P6CDJZR997"
    ;;
--- a/fragments/labels/egnyte.sh
+++ b/fragments/labels/egnyte.sh
@@ -3,6 +3,7 @@ egnyte)
    name="Egnyte Connect"
    type="pkg"
    downloadURL="https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/latest/EgnyteConnectMac.pkg"
+    appNewVersion=$(curl -fs "https://egnyte-cdn.egnyte.com/egnytedrive/mac/en-us/versions/default.xml" | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' | cut -d '"' -f 2)
    expectedTeamID="FELUD555VC"
    blockingProcesses=( NONE )
    ;;
--- a/fragments/labels/firefox.sh
+++ b/fragments/labels/firefox.sh
@@ -2,7 +2,8 @@ firefox)
    name="Firefox"
    type="dmg"
    downloadURL="https://download.mozilla.org/?product=firefox-latest&os=osx&lang=en-US"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
--- a/fragments/labels/firefox_da.sh
+++ b/fragments/labels/firefox_da.sh
@@ -2,7 +2,8 @@ firefox_da)
    name="Firefox"
    type="dmg"
    downloadURL="https://download.mozilla.org/?product=firefox-latest&amp;os=osx&amp;lang=da"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    printlog "WARNING for ERROR: Label firefox, firefox_da and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
--- a/fragments/labels/firefox_intl.sh
+++ b/fragments/labels/firefox_intl.sh
@@ -19,7 +19,8 @@ firefox_intl)
        printlog "Download not found for '$userLanguage', using default ('en-US')."
        downloadURL="https://download.mozilla.org/?product=firefox-latest-ssl&os=osx"
    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"/"); print a[1]}')
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
--- a/fragments/labels/firefoxesr.sh
+++ b/fragments/labels/firefoxesr.sh
@@ -3,7 +3,8 @@ firefoxesrpkg)
    name="Firefox"
    type="pkg"
    downloadURL="https://download.mozilla.org/?product=firefox-esr-pkg-latest-ssl&os=osx"
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*releases\/([0-9.]*)esr.*/\1/g')
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "FIREFOX_ESR")
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    ;;
--- a/fragments/labels/firefoxesr_intl.sh
+++ b/fragments/labels/firefoxesr_intl.sh
@@ -19,7 +19,8 @@ firefoxesr_intl)
        printlog "Download not found for '$userLanguage', using default ('en-US')."
        downloadURL="https://download.mozilla.org/?product=firefox-esr-latest-ssl&os=osx"
    fi
-    appNewVersion=$(curl -fsIL $downloadURL | awk -F releases/ '/Location:/ {split($2,a,"esr/"); print a[1]}')
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    printlog "WARNING for ERROR: Label firefox and firefox_intl should not be used. Instead use firefoxpkg and firefoxpkg_intl as per recommendations from Firefox. It's not fully certain that the app actually gets updated here. firefoxpkg and firefoxpkg_intl will have built in updates and make sure the client is updated in the future." REQ
--- a/fragments/labels/firefoxpkg.sh
+++ b/fragments/labels/firefoxpkg.sh
@@ -2,7 +2,8 @@ firefoxpkg)
    name="Firefox"
    type="pkg"
    downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
-    appNewVersion=$(curl -fs https://www.mozilla.org/en-US/firefox/releases/ | grep '<html' | grep -o -i -e "data-latest-firefox=\"[0-9.]*\"" | cut -d '"' -f2)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    ;;
--- a/fragments/labels/firefoxpkg_intl.sh
+++ b/fragments/labels/firefoxpkg_intl.sh
@@ -18,7 +18,8 @@ firefoxpkg_intl)
        printlog "Download not found for that language. Using en-US" WARN
        downloadURL="https://download.mozilla.org/?product=firefox-pkg-latest-ssl&os=osx&lang=en-US"
    fi
-    appNewVersion=$(curl -fsIL "$downloadURL" | grep -i location | cut -d "/" -f7)
+    firefoxVersions=$(curl -fs "https://product-details.mozilla.org/1.0/firefox_versions.json")
+    appNewVersion=$(getJSONValue "$firefoxVersions" "LATEST_FIREFOX_VERSION")
    expectedTeamID="43AQ936H96"
    blockingProcesses=( firefox )
    ;;
--- a/fragments/labels/googlechromeenterprise.sh
+++ b/fragments/labels/googlechromeenterprise.sh
@@ -0,0 +1,10 @@
+googlechromeenterprise)
+    name="Google Chrome"
+    type="pkg"
+    downloadURL="https://dl.google.com/dl/chrome/mac/universal/stable/gcem/GoogleChrome.pkg"
+    appNewVersion=$(curl -s https://omahaproxy.appspot.com/history | awk -F',' '/mac_arm64,stable/{print $3; exit}')
+    expectedTeamID="EQHXZ8M8AV"
+    updateTool="/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/GoogleSoftwareUpdateAgent.app/Contents/MacOS/GoogleSoftwareUpdateAgent"
+    updateToolArguments=( -runMode oneshot -userInitiated YES )
+    updateToolRunAsCurrentUser=1
+    ;;
--- a/fragments/labels/marathon.sh
+++ b/fragments/labels/marathon.sh
@@ -2,6 +2,7 @@ marathon)
    name="Marathon"
    type="dmg"
    archiveName="Marathon-[0-9.]*-Mac.dmg"
+    versionKey="CFBundleVersion"
    downloadURL="$(downloadURLFromGit Aleph-One-Marathon alephone)"
    appNewVersion="$(versionFromGit Aleph-One-Marathon alephone)"
    expectedTeamID="E8K89CXZE7"
--- a/fragments/labels/marathon2.sh
+++ b/fragments/labels/marathon2.sh
@@ -2,6 +2,7 @@ marathon2)
    name="Marathon 2"
    type="dmg"
    archiveName="Marathon2-[0-9.]*-Mac.dmg"
+    versionKey="CFBundleVersion"
    downloadURL="$(downloadURLFromGit Aleph-One-Marathon alephone)"
    appNewVersion="$(versionFromGit Aleph-One-Marathon alephone)"
    expectedTeamID="E8K89CXZE7"
--- a/fragments/labels/marathoninfinity.sh
+++ b/fragments/labels/marathoninfinity.sh
@@ -2,6 +2,7 @@ marathoninfinity)
    name="Marathon Infinity"
    type="dmg"
    archiveName="MarathonInfinity-[0-9.]*-Mac.dmg"
+    versionKey="CFBundleVersion"
    downloadURL="$(downloadURLFromGit Aleph-One-Marathon alephone)"
    appNewVersion="$(versionFromGit Aleph-One-Marathon alephone)"
    expectedTeamID="E8K89CXZE7"
--- a/fragments/labels/miro.sh
+++ b/fragments/labels/miro.sh
@@ -2,6 +2,10 @@ miro)
    # credit: @matins
    name="Miro"
    type="dmg"
-    downloadURL="https://desktop.miro.com/platforms/darwin/Miro.dmg"
+    if [[ $(arch) == arm64 ]]; then
+        downloadURL="https://desktop.miro.com/platforms/darwin-arm64/Miro.dmg"
+    elif [[ $(arch) == i386 ]]; then
+        downloadURL="https://desktop.miro.com/platforms/darwin/Miro.dmg"
+    fi
    expectedTeamID="M3GM7MFY7U"
    ;;
--- a/fragments/labels/mmhmm.sh
+++ b/fragments/labels/mmhmm.sh
@@ -0,0 +1,8 @@
+mmhmm)
+    name="mmhmm"
+    type="pkg"
+    downloadURL="https://updates.mmhmm.app/mac/mmhmm.pkg"
+    curlOptions=( -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.5 Safari/605.1.15" )
+    appNewVersion=$(curl -H "User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/15.1 Safari/605.1.15" -fs "https://help.mmhmm.app/hc/en-us/articles/4420969712151-mmhmm-for-Mac" | grep 'The latest version of mmhmm for Mac is <strong>*' | sed -e 's/.*\<strong\>\(.*\)\.\<\/strong\>.*/\1/')
+    expectedTeamID="M3KUT44L48"
+    ;;
--- a/fragments/labels/nordlayer.sh
+++ b/fragments/labels/nordlayer.sh
@@ -0,0 +1,7 @@
+nordlayer)
+    # credit: Taboc741 (https://github.com/taboc741)
+    name="NordLayer"
+    type="pkg"
+    downloadURL="https://downloads.nordlayer.com/mac/latest/NordLayer.pkg"
+    expectedTeamID="W5W395V82Y"
+    ;;
--- a/fragments/labels/notion.sh
+++ b/fragments/labels/notion.sh
@@ -4,9 +4,10 @@ notion)
    type="dmg"
    if [[ $(arch) == "arm64" ]]; then
        downloadURL="https://www.notion.so/desktop/apple-silicon/download"
+        appNewVersion=$( curl -fsIL "https://www.notion.so/desktop/apple-silicon/download" | grep -i "^location" | awk '{print $2}' | sed -e 's/.*Notion\-\(.*\)\-arm64.dmg.*/\1/' )
    elif [[ $(arch) == "i386" ]]; then
        downloadURL="https://www.notion.so/desktop/mac/download"
+        appNewVersion=$( curl -fsIL "https://www.notion.so/desktop/mac/download" | grep -i "^location" | awk '{print $2}' | sed -e 's/.*Notion\-\(.*\).dmg.*/\1/' )
    fi
-    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | tr -d '\r\n' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
    expectedTeamID="LBQJ96FQ8D"
    ;;
--- a/fragments/labels/ringcentralapp.sh
+++ b/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" )
    ;;
--- a/fragments/labels/whatroute.sh
+++ b/fragments/labels/whatroute.sh
@@ -0,0 +1,7 @@
+whatroute)
+    name="WhatRoute"
+    type="zip"
+    downloadURL="$(curl -fs https://www.whatroute.net/whatroute2appcast.xml | xpath '(//rss/channel/item/enclosure/@url)[1]' 2>/dev/null | cut -d '"' -f2)"
+    appNewVersion="$(curl -fs https://www.whatroute.net/whatroute2appcast.xml | xpath '(//rss/channel/item/enclosure/@sparkle:shortVersionString)[1]' 2>/dev/null | cut -d '"' -f2)"
+    expectedTeamID="H5879E8LML"
+    ;;
--- a/utils/assemble.sh
+++ b/utils/assemble.sh
@@ -127,6 +127,8 @@ if [[ $buildScript -eq 1 ]]; then
    echo "# copying script to $repo_dir/Installomator.sh"
    cp $destination_file $repo_dir/Installomator.sh
    chmod 755 $repo_dir/Installomator.sh
+    # also update Labels.txt
+    $repo_dir/Installomator.sh | tail -n +2 > $repo_dir/Labels.txt
 fi

 # build a pkg when flag is set
Author	SHA1	Message	Date
Armin Briegel	4e5f069024	Merge pull request #565 from Installomator/Barco-ClickShare Barco click share	2022-06-22 15:23:06 +02:00
Armin Briegel	034e60a190	Merge pull request #560 from Installomator/Theile-labels-10 WhatRoute label	2022-06-22 15:19:24 +02:00
Armin Briegel	053b0a1225	Merge pull request #544 from Installomator/Marathon-Trilogy Marathon Trilogy with `versionKey` added to the labels.	2022-06-22 15:13:27 +02:00
Armin Briegel	4eb6a94a53	Merge pull request #540 from scriptingosx/assemble-script-update updated assemble.sh to update Labels.txt when script is built	2022-06-22 15:05:50 +02:00
Armin Briegel	f166cf7efa	Merge pull request #539 from scriptingosx/miro-universal updated miro for arm download	2022-06-22 15:05:20 +02:00
Armin Briegel	60f7ee237a	Merge pull request #533 from scriptingosx/egnyte-version add appNewVersion to egnyte label	2022-06-22 15:04:46 +02:00
Armin Briegel	69bb31b3a2	Merge pull request #535 from cardinaldeville/main Fixes issue with Blender not installing	2022-06-22 15:02:32 +02:00
Armin Briegel	fe48e4628e	Merge pull request #419	2022-06-22 14:57:26 +02:00
Armin Briegel	acb2963f7a	changed filename case	2022-06-22 14:55:10 +02:00
Armin Briegel	5b46970d51	Merge branch 'dev'	2022-06-22 14:52:04 +02:00
Armin Briegel	6f9d2a711d	Merge pull request #506 from theadamcraig/patch-2 Create bluejeanswithaudiodriver label	2022-06-22 14:50:44 +02:00
Armin Briegel	f444c9a0ba	Merge pull request #532 from FletcherS7/main New Label: Google Chrome Enterprise	2022-06-22 14:48:06 +02:00
Armin Briegel	21128946ef	Merge pull request #528 from scriptingosx/adobecreateclouddesktop-xml html parsing now done with xmllint, should be more resilient	2022-06-17 15:56:57 +02:00
Armin Briegel	35eb65f668	Merge pull request #529 from scriptingosx/jxa-json added function for JSON parsing using JXA	2022-06-17 15:56:30 +02:00
Armin Briegel	84d4184b1e	Merge pull request #517 from mwmatter/workspaceone Adding Workspace ONE support	2022-06-17 15:55:54 +02:00
Adam Codega	ba767cb2df	Merge pull request #550 from FletcherS7/update-ringcentral-label Update ringcentralapp label to fix not detecting blocking processes	2022-06-10 16:07:21 -04:00
Adam Codega	6108758a2f	Merge pull request #571 from FletcherS7/label-mmhmm New Label: mmhmm	2022-06-10 16:06:40 -04:00
Adam Codega	f7f918edcb	Merge pull request #566 from FletcherS7/update-notion-label Update Notion label to fix wrong version detection on arm installs	2022-06-10 15:55:15 -04:00
Fletcher Salesky	5e0e77c346	Update notion.sh	2022-06-07 18:16:18 -07:00
Søren Theilgaard	9e24f2b8e8	rename label name It already existed…	2022-05-27 12:18:18 +02:00
Søren Theilgaard	7b4b1d12d1	WhatRoute label A network utility: ``` Installomator/utils/assemble.sh whatroute 2022-05-25 13:46:54 : REQ : whatroute : ################## Start Installomator v. 10.0beta, date 2022-05-25 2022-05-25 13:46:54 : INFO : whatroute : ################## Version: 10.0beta 2022-05-25 13:46:54 : INFO : whatroute : ################## Date: 2022-05-25 2022-05-25 13:46:54 : INFO : whatroute : ################## whatroute 2022-05-25 13:46:54 : DEBUG : whatroute : DEBUG mode 1 enabled. 2022-05-25 13:46:58 : INFO : whatroute : BLOCKING_PROCESS_ACTION=tell_user 2022-05-25 13:46:58 : INFO : whatroute : NOTIFY=success 2022-05-25 13:46:58 : INFO : whatroute : LOGGING=DEBUG 2022-05-25 13:46:58 : INFO : whatroute : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-25 13:46:58 : INFO : whatroute : Label type: zip 2022-05-25 13:46:58 : INFO : whatroute : archiveName: WhatRoute.zip 2022-05-25 13:46:58 : INFO : whatroute : no blocking processes defined, using WhatRoute as default 2022-05-25 13:46:58 : DEBUG : whatroute : Changing directory to /Users/st/Documents/GitHub/Installomator/build 2022-05-25 13:46:58 : INFO : whatroute : App(s) found: /Applications/WhatRoute.app 2022-05-25 13:46:58 : INFO : whatroute : found app at /Applications/WhatRoute.app, version 2.5.0, on versionKey CFBundleShortVersionString 2022-05-25 13:46:58 : INFO : whatroute : appversion: 2.5.0 2022-05-25 13:46:58 : INFO : whatroute : Latest version of WhatRoute is 2.5.0 2022-05-25 13:46:58 : WARN : whatroute : DEBUG mode 1 enabled, not exiting, but there is no new version of app. 2022-05-25 13:46:58 : REQ : whatroute : Downloading https://www.whatroute.net/software/whatroute-2.5.0.zip to WhatRoute.zip 2022-05-25 13:47:18 : DEBUG : whatroute : File list: -rw-r--r-- 1 st staff 38M May 25 13:47 WhatRoute.zip 2022-05-25 13:47:18 : DEBUG : whatroute : File type: WhatRoute.zip: Zip archive data, at least v1.0 to extract, compression method=store 2022-05-25 13:47:18 : DEBUG : whatroute : curl output was: * Trying 222.154.233.147:443... * Connected to www.whatroute.net (222.154.233.147) port 443 (#0) * ALPN, offering h2 * ALPN, offering http/1.1 * successfully set certificate verify locations: * CAfile: /etc/ssl/cert.pem * CApath: none * (304) (OUT), TLS handshake, Client hello (1): } [322 bytes data] * (304) (IN), TLS handshake, Server hello (2): { [122 bytes data] * (304) (IN), TLS handshake, Unknown (8): { [25 bytes data] * (304) (IN), TLS handshake, Certificate (11): { [4423 bytes data] * (304) (IN), TLS handshake, CERT verify (15): { [264 bytes data] * (304) (IN), TLS handshake, Finished (20): { [36 bytes data] * (304) (OUT), TLS handshake, Finished (20): } [36 bytes data] * SSL connection using TLSv1.3 / AEAD-CHACHA20-POLY1305-SHA256 * ALPN, server accepted to use http/1.1 * Server certificate: * subject: CN=bryanc.co.nz * start date: May 15 06:02:07 2022 GMT * expire date: Aug 13 06:02:06 2022 GMT * subjectAltName: host "www.whatroute.net" matched cert's "www.whatroute.net" * issuer: C=US; O=Let's Encrypt; CN=R3 * SSL certificate verify ok. > GET /software/whatroute-2.5.0.zip HTTP/1.1 > Host: www.whatroute.net > User-Agent: curl/7.79.1 > Accept: / > * Mark bundle as not supporting multiuse < HTTP/1.1 200 OK < Date: Wed, 25 May 2022 11:46:59 GMT < Server: Apache < Last-Modified: Thu, 31 Mar 2022 01:31:34 GMT < ETag: "2586bfd-5db799f55fabc" < Accept-Ranges: bytes < Content-Length: 39349245 < Content-Type: application/zip < { [7964 bytes data] * Connection #0 to host www.whatroute.net left intact 2022-05-25 13:47:18 : DEBUG : whatroute : DEBUG mode 1, not checking for blocking processes 2022-05-25 13:47:18 : REQ : whatroute : Installing WhatRoute 2022-05-25 13:47:18 : INFO : whatroute : Unzipping WhatRoute.zip 2022-05-25 13:47:19 : INFO : whatroute : Verifying: /Users/st/Documents/GitHub/Installomator/build/WhatRoute.app 2022-05-25 13:47:19 : DEBUG : whatroute : App size: 60M /Users/st/Documents/GitHub/Installomator/build/WhatRoute.app 2022-05-25 13:47:19 : DEBUG : whatroute : Debugging enabled, App Verification output was: /Users/st/Documents/GitHub/Installomator/build/WhatRoute.app: accepted source=Notarized Developer ID origin=Developer ID Application: Bryan Christianson (H5879E8LML) 2022-05-25 13:47:20 : INFO : whatroute : Team ID matching: H5879E8LML (expected: H5879E8LML ) 2022-05-25 13:47:20 : INFO : whatroute : Downloaded version of WhatRoute is 2.5.0 on versionKey CFBundleShortVersionString, same as installed. 2022-05-25 13:47:20 : DEBUG : whatroute : DEBUG mode 1, not reopening anything 2022-05-25 13:47:20 : REG : whatroute : No new version to install 2022-05-25 13:47:20 : REQ : whatroute : ################## End Installomator, exit code 0 ```	2022-05-25 14:03:51 +02:00
Søren Theilgaard	c219f38459	Create barcoclickshare.sh	2022-05-25 13:26:37 +02:00
Fletcher Salesky	82bda85d6c	Merge branch 'Installomator:main' into main	2022-05-23 15:01:19 -07:00
Fletcher Salesky	e56be4f18a	Update ringcentralapp.sh	2022-05-20 19:31:58 -07:00
Fletcher Salesky	f8b91946c6	Create mmhmm.sh	2022-05-19 21:35:27 -07:00
Søren Theilgaard	3ccc9dc93e	`versionKey` added to the labels. Output: ``` ➜ Installomator/utils/assemble.sh marathoninfinity DEBUG=0 2022-05-18 15:21:53 : WARN : marathoninfinity : setting variable from argument DEBUG=0 2022-05-18 15:21:53 : REQ : marathoninfinity : ################## Start Installomator v. 10.0beta, date 2022-05-18 2022-05-18 15:21:53 : INFO : marathoninfinity : ################## Version: 10.0beta 2022-05-18 15:21:53 : INFO : marathoninfinity : ################## Date: 2022-05-18 2022-05-18 15:21:53 : INFO : marathoninfinity : ################## marathoninfinity 2022-05-18 15:21:53 : INFO : marathoninfinity : BLOCKING_PROCESS_ACTION=tell_user 2022-05-18 15:21:53 : INFO : marathoninfinity : NOTIFY=success 2022-05-18 15:21:53 : INFO : marathoninfinity : LOGGING=INFO 2022-05-18 15:21:53 : INFO : marathoninfinity : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-18 15:21:53 : INFO : marathoninfinity : Label type: dmg 2022-05-18 15:21:53 : INFO : marathoninfinity : archiveName: MarathonInfinity-[0-9.]-Mac.dmg 2022-05-18 15:21:53 : INFO : marathoninfinity : no blocking processes defined, using Marathon Infinity as default 2022-05-18 15:21:53 : INFO : marathoninfinity : App(s) found: /Applications/Marathon Infinity.app 2022-05-18 15:21:53 : INFO : marathoninfinity : found app at /Applications/Marathon Infinity.app, version 20220115, on versionKey CFBundleVersion 2022-05-18 15:21:53 : INFO : marathoninfinity : appversion: 20220115 2022-05-18 15:21:53 : INFO : marathoninfinity : Latest version of Marathon Infinity is 20220115 2022-05-18 15:21:53 : INFO : marathoninfinity : There is no newer version available. 2022-05-18 15:21:53 : INFO : marathoninfinity : App not closed, so no reopen. 2022-05-18 15:21:53 : REQ : marathoninfinity : No newer version. 2022-05-18 15:21:53 : REQ : marathoninfinity : ################## End Installomator, exit code 0 ➜ Installomator/utils/assemble.sh marathon DEBUG=0 2022-05-18 15:22:04 : WARN : marathon : setting variable from argument DEBUG=0 2022-05-18 15:22:04 : REQ : marathon : ################## Start Installomator v. 10.0beta, date 2022-05-18 2022-05-18 15:22:04 : INFO : marathon : ################## Version: 10.0beta 2022-05-18 15:22:04 : INFO : marathon : ################## Date: 2022-05-18 2022-05-18 15:22:04 : INFO : marathon : ################## marathon 2022-05-18 15:22:04 : INFO : marathon : BLOCKING_PROCESS_ACTION=tell_user 2022-05-18 15:22:04 : INFO : marathon : NOTIFY=success 2022-05-18 15:22:04 : INFO : marathon : LOGGING=INFO 2022-05-18 15:22:04 : INFO : marathon : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-18 15:22:04 : INFO : marathon : Label type: dmg 2022-05-18 15:22:04 : INFO : marathon : archiveName: Marathon-[0-9.]-Mac.dmg 2022-05-18 15:22:04 : INFO : marathon : no blocking processes defined, using Marathon as default 2022-05-18 15:22:04 : INFO : marathon : App(s) found: /Applications/Marathon.app 2022-05-18 15:22:04 : INFO : marathon : found app at /Applications/Marathon.app, version 20220115, on versionKey CFBundleVersion 2022-05-18 15:22:04 : INFO : marathon : appversion: 20220115 2022-05-18 15:22:04 : INFO : marathon : Latest version of Marathon is 20220115 2022-05-18 15:22:04 : INFO : marathon : There is no newer version available. 2022-05-18 15:22:04 : INFO : marathon : App not closed, so no reopen. 2022-05-18 15:22:04 : REQ : marathon : No newer version. 2022-05-18 15:22:04 : REQ : marathon : ################## End Installomator, exit code 0 ➜ Installomator/utils/assemble.sh marathon2 DEBUG=0 2022-05-18 15:22:08 : WARN : marathon2 : setting variable from argument DEBUG=0 2022-05-18 15:22:08 : REQ : marathon2 : ################## Start Installomator v. 10.0beta, date 2022-05-18 2022-05-18 15:22:08 : INFO : marathon2 : ################## Version: 10.0beta 2022-05-18 15:22:08 : INFO : marathon2 : ################## Date: 2022-05-18 2022-05-18 15:22:08 : INFO : marathon2 : ################## marathon2 2022-05-18 15:22:08 : INFO : marathon2 : BLOCKING_PROCESS_ACTION=tell_user 2022-05-18 15:22:08 : INFO : marathon2 : NOTIFY=success 2022-05-18 15:22:08 : INFO : marathon2 : LOGGING=INFO 2022-05-18 15:22:08 : INFO : marathon2 : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns 2022-05-18 15:22:08 : INFO : marathon2 : Label type: dmg 2022-05-18 15:22:08 : INFO : marathon2 : archiveName: Marathon2-[0-9.]*-Mac.dmg 2022-05-18 15:22:08 : INFO : marathon2 : no blocking processes defined, using Marathon 2 as default 2022-05-18 15:22:08 : INFO : marathon2 : App(s) found: /Applications/Marathon 2.app 2022-05-18 15:22:08 : INFO : marathon2 : found app at /Applications/Marathon 2.app, version 20220115, on versionKey CFBundleVersion 2022-05-18 15:22:08 : INFO : marathon2 : appversion: 20220115 2022-05-18 15:22:08 : INFO : marathon2 : Latest version of Marathon 2 is 20220115 2022-05-18 15:22:08 : INFO : marathon2 : There is no newer version available. 2022-05-18 15:22:08 : INFO : marathon2 : App not closed, so no reopen. 2022-05-18 15:22:08 : REQ : marathon2 : No newer version. 2022-05-18 15:22:08 : REQ : marathon2 : ################## End Installomator, exit code 0 ```	2022-05-18 15:23:52 +02:00
Armin Briegel	b99c2619f4	updated assemble.sh to update Labels.txt when building script	2022-05-18 10:36:39 +02:00
Armin Briegel	8789d2cd75	updated miro for arm download, closes #475	2022-05-18 10:14:57 +02:00
Chris Abbs	ca73eca5f2	edited fragment per contribution guidelines	2022-05-17 12:19:30 -05:00
Armin Briegel	af6ab1ae56	add appNewVersion to egnyte label, closes #500	2022-05-17 18:29:04 +02:00
Fletcher Salesky	7db13f0ecb	Create googlechromeenterprise.sh	2022-05-16 13:28:07 -07:00
Armin Briegel	2b658a576c	added function for JSON parsing using JXA	2022-05-13 10:44:26 +02:00
Armin Briegel	d3390fefe6	html parsing now done with xmllint, should be more resilient, maybe	2022-05-13 10:22:53 +02:00
Mike Matter	9e0bfd5818	WS1 support (remove sudo) Removing sudo from notify command.	2022-05-11 11:33:33 -05:00
Mike Matter	5477c5ccfe	Adding WS1 support (Blocking app dialogue)	2022-05-09 12:02:50 -05:00
Mike Matter	4f3b130b04	Adding Workspace ONE support (fixing comment)	2022-05-09 11:50:27 -05:00
Mike Matter	52ad8d9d88	Adding Workspace ONE support	2022-05-09 11:40:28 -05:00
theadamcraig	63ddb9d2e7	Create bluejeanswithaudiodriver.sh the exact same as the bluejeans label, but with a new variable choiceChangesXML this allows the package to be customized on installation which in this instance will have the BlueJeans Audio Driver installed with the software.	2022-05-02 13:00:30 -04:00
taboc741	fbe58f8ee3	Update and rename NordVPNTeams.sh to NordLayer.sh Fixed legacy branding from their documentation and pointed to modern URL.	2022-02-14 12:46:46 -05:00
taboc741	e8948dafb3	Create NordVPNTeams.sh Adding download package support for NordLayer aka NordVPN Teams	2022-02-14 12:33:20 -05:00