From 96bad4bd84da28f90ebbbf05ed7eee70ee450fff Mon Sep 17 00:00:00 2001
From: macmangr <106015597+macmangr@users.noreply.github.com>
Date: Fri, 17 Jun 2022 21:20:51 +0200
Subject: [PATCH 01/39] New Label: OnScreen Control

An LG Monitor Utility

"OnScreen Control is an application used to manage a single monitor or a group of monitor with useful features such as Monitor Control, My Display Presets and Screen Split. OnScreen Control displays all connected LG monitor information. This software is compatible with LG monitors only."

./assemble.sh -l /Users/savvas/Desktop/Mosyle/Resources/InstallomatorLabels onscreencontrol
2022-06-17 20:58:28 : REQ   : onscreencontrol : ################## Start Installomator v. 9.2, date 2022-06-17
2022-06-17 20:58:28 : INFO  : onscreencontrol : ################## Version: 9.2
2022-06-17 20:58:28 : INFO  : onscreencontrol : ################## Date: 2022-06-17
2022-06-17 20:58:28 : INFO  : onscreencontrol : ################## onscreencontrol
2022-06-17 20:58:28 : DEBUG : onscreencontrol : DEBUG mode 1 enabled.
2022-06-17 20:58:28 : INFO  : onscreencontrol : BLOCKING_PROCESS_ACTION=tell_user
2022-06-17 20:58:28 : INFO  : onscreencontrol : NOTIFY=success
2022-06-17 20:58:28 : INFO  : onscreencontrol : LOGGING=DEBUG
2022-06-17 20:58:28 : INFO  : onscreencontrol : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2022-06-17 20:58:28 : INFO  : onscreencontrol : Label type: pkgInZip
2022-06-17 20:58:28 : INFO  : onscreencontrol : archiveName: OnScreen Control.zip
2022-06-17 20:58:28 : INFO  : onscreencontrol : no blocking processes defined, using OnScreen Control as default
2022-06-17 20:58:28 : DEBUG : onscreencontrol : Changing directory to /Users/savvas/Desktop/Mosyle/Resources/Installomator-main original/build
2022-06-17 20:58:29 : INFO  : onscreencontrol : No version found using packageID com.LGSI.OnScreen-Control
2022-06-17 20:58:29 : INFO  : onscreencontrol : App(s) found: /Applications/OnScreen Control.app
2022-06-17 20:58:29 : INFO  : onscreencontrol : found app at /Applications/OnScreen Control.app, version 5.47, on versionKey CFBundleShortVersionString
2022-06-17 20:58:29 : INFO  : onscreencontrol : appversion: 5.47
2022-06-17 20:58:29 : INFO  : onscreencontrol : Latest version of OnScreen Control is 5.47
2022-06-17 20:58:29 : WARN  : onscreencontrol : DEBUG mode 1 enabled, not exiting, but there is no new version of app.
2022-06-17 20:58:29 : REQ   : onscreencontrol : Downloading https://lmu.lge.com/ExternalService/onscreencontrol/mac/2.0/OnScreenControl_5.47.zip to OnScreen Control.zip
2022-06-17 20:58:37 : DEBUG : onscreencontrol : File list: -rw-r--r--  1 savvas  staff    56M 17 Jun 20:58 OnScreen Control.zip
2022-06-17 20:58:37 : DEBUG : onscreencontrol : File type: OnScreen Control.zip: Zip archive data, at least v2.0 to extract, compression method=deflate
2022-06-17 20:58:37 : DEBUG : onscreencontrol : curl output was:
*   Trying 23.48.23.5:443...
* Connected to lmu.lge.com (23.48.23.5) 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):
} [316 bytes data]
* (304) (IN), TLS handshake, Server hello (2):
{ [122 bytes data]
* (304) (IN), TLS handshake, Unknown (8):
{ [35 bytes data]
* (304) (IN), TLS handshake, Certificate (11):
{ [4021 bytes data]
* (304) (IN), TLS handshake, CERT verify (15):
{ [264 bytes data]
* (304) (IN), TLS handshake, Finished (20):
{ [52 bytes data]
* (304) (OUT), TLS handshake, Finished (20):
} [52 bytes data]
* SSL connection using TLSv1.3 / AEAD-AES256-GCM-SHA384
* ALPN, server accepted to use http/1.1
* Server certificate:
*  subject: CN=lmu.lge.com
*  start date: May 29 23:40:15 2022 GMT
*  expire date: Aug 27 23:40:14 2022 GMT
*  subjectAltName: host "lmu.lge.com" matched cert's "lmu.lge.com"
*  issuer: C=US; O=Let's Encrypt; CN=R3
*  SSL certificate verify ok.
> GET /ExternalService/onscreencontrol/mac/2.0/OnScreenControl_5.47.zip HTTP/1.1
> Host: lmu.lge.com
> User-Agent: curl/7.79.1
> Accept: */*
>
* Mark bundle as not supporting multiuse
< HTTP/1.1 200 OK
< Accept-Ranges: bytes
< Content-Type: application/zip
< ETag: "723d7988a59767c9a2aef6c274d5e5c1:1653637134.542227"
< Last-Modified: Fri, 27 May 2022 07:38:54 GMT
< Server: AkamaiNetStorage
< Content-Length: 59160965
< Expires: Fri, 17 Jun 2022 18:58:29 GMT
< Cache-Control: max-age=0, no-cache, no-store
< Pragma: no-cache
< Date: Fri, 17 Jun 2022 18:58:29 GMT
< Connection: keep-alive
<
{ [15989 bytes data]
* Connection #0 to host lmu.lge.com left intact

2022-06-17 20:58:37 : DEBUG : onscreencontrol : DEBUG mode 1, not checking for blocking processes
2022-06-17 20:58:37 : REQ   : onscreencontrol : Installing OnScreen Control
2022-06-17 20:58:37 : INFO  : onscreencontrol : Unzipping OnScreen Control.zip
2022-06-17 20:58:37 : DEBUG : onscreencontrol : Found pkg(s):
/Users/savvas/Desktop/Mosyle/Resources/Installomator-main original/build/OSC_V5.47_signed.pkg
2022-06-17 20:58:37 : INFO  : onscreencontrol : found pkg: /Users/savvas/Desktop/Mosyle/Resources/Installomator-main original/build/OSC_V5.47_signed.pkg
2022-06-17 20:58:37 : INFO  : onscreencontrol : Verifying: /Users/savvas/Desktop/Mosyle/Resources/Installomator-main original/build/OSC_V5.47_signed.pkg
2022-06-17 20:58:37 : DEBUG : onscreencontrol : File list: -rw-r--r--@ 1 savvas  staff    56M 27 Mai 05:53 /Users/savvas/Desktop/Mosyle/Resources/Installomator-main original/build/OSC_V5.47_signed.pkg
2022-06-17 20:58:37 : DEBUG : onscreencontrol : File type: /Users/savvas/Desktop/Mosyle/Resources/Installomator-main original/build/OSC_V5.47_signed.pkg: xar archive compressed TOC: 8499, SHA-1 checksum
2022-06-17 20:58:38 : DEBUG : onscreencontrol : spctlOut is /Users/savvas/Desktop/Mosyle/Resources/Installomator-main original/build/OSC_V5.47_signed.pkg: accepted
2022-06-17 20:58:38 : DEBUG : onscreencontrol : source=Notarized Developer ID
2022-06-17 20:58:38 : DEBUG : onscreencontrol : override=security disabled
2022-06-17 20:58:38 : DEBUG : onscreencontrol : origin=Developer ID Installer: LG Electronics (5SKT5H4CPQ)
2022-06-17 20:58:38 : INFO  : onscreencontrol : Team ID: 5SKT5H4CPQ (expected: 5SKT5H4CPQ )
2022-06-17 20:58:38 : INFO  : onscreencontrol : Checking package version.
2022-06-17 20:58:39 : INFO  : onscreencontrol : Downloaded package com.LGSI.OnScreen-Control version 5.47
2022-06-17 20:58:39 : INFO  : onscreencontrol : Downloaded version of OnScreen Control is the same as installed.
2022-06-17 20:58:39 : DEBUG : onscreencontrol : DEBUG mode 1, not reopening anything
2022-06-17 20:58:39 : REQ   : onscreencontrol : No new version to install
2022-06-17 20:58:39 : REQ   : onscreencontrol : ################## End Installomator, exit code 0
---
 fragments/labels/onscreencontrol.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fragments/labels/onscreencontrol.sh

diff --git a/fragments/labels/onscreencontrol.sh b/fragments/labels/onscreencontrol.sh
new file mode 100644
index 0000000..1ad2cc0
--- /dev/null
+++ b/fragments/labels/onscreencontrol.sh
@@ -0,0 +1,8 @@
+onscreencontrol)
+    name="OnScreen Control"
+    type="pkgInZip"
+    packageID="com.LGSI.OnScreen-Control"
+    downloadURL=$(currentFileName=`curl -s https://lmu.lge.com/ExternalService/onscreencontrol/mac/2.0/OnScreenControlLatestVersion.txt` && echo https://lmu.lge.com/ExternalService/onscreencontrol/mac/2.0/"$currentFileName")
+    appNewVersion=$(curl -s https://lmu.lge.com/ExternalService/onscreencontrol/mac/2.0/OnScreenControlLatestVersion.txt | sed -E 's/.*_([0-9.]*)\.zip/\1/g')
+    expectedTeamID="5SKT5H4CPQ"
+    ;;

From 0a9957169e39eeb2be9a0074c4deaee0f14fa6e3 Mon Sep 17 00:00:00 2001
From: macmangr <106015597+macmangr@users.noreply.github.com>
Date: Sat, 9 Jul 2022 13:43:52 +0200
Subject: [PATCH 02/39] Update tunnelblick.sh

Added appNewVersion check
---
 fragments/labels/tunnelblick.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/fragments/labels/tunnelblick.sh b/fragments/labels/tunnelblick.sh
index 455d500..e87ecfb 100644
--- a/fragments/labels/tunnelblick.sh
+++ b/fragments/labels/tunnelblick.sh
@@ -2,5 +2,6 @@ tunnelblick)
     name="Tunnelblick"
     type="dmg"
     downloadURL=$(downloadURLFromGit TunnelBlick Tunnelblick )
+    appNewVersion=$(curl -sf https://github.com/Tunnelblick/Tunnelblick/releases | grep -m 1 "/Tunnelblick/Tunnelblick/releases/tag/" | sed -r 's/.*Tunnelblick ([^<]+).*/\1/')
     expectedTeamID="Z2SG5H3HC8"
     ;;

From 5ab42971e55ea4d40e11130305a4ccf474805b42 Mon Sep 17 00:00:00 2001
From: Fredrik Larsson <fredrik.larsson@uu.se>
Date: Mon, 12 Sep 2022 16:28:03 +0200
Subject: [PATCH 03/39] New Label: MacTeX

---
 fragments/labels/mactex.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 fragments/labels/mactex.sh

diff --git a/fragments/labels/mactex.sh b/fragments/labels/mactex.sh
new file mode 100644
index 0000000..cef0ff8
--- /dev/null
+++ b/fragments/labels/mactex.sh
@@ -0,0 +1,7 @@
+mactex)
+    name="MacTeX"
+    appName="TeX Live Utility.app"
+    type="pkg"
+    downloadURL="https://mirror.ctan.org/systems/mac/mactex/MacTeX.pkg"
+    expectedTeamID="RBGCY5RJWM"
+    ;;

From a5421ad2264a20697ec97a408a2f985ec8a7d2d2 Mon Sep 17 00:00:00 2001
From: Fredrik Larsson <fredrik.larsson@uu.se>
Date: Tue, 13 Sep 2022 08:39:21 +0200
Subject: [PATCH 04/39] New Label: Projectplace

2022-09-13 08:38:09 : REQ   : projectplace : ################## Start Installomator v. 10.0beta3, date 2022-09-13
2022-09-13 08:38:09 : INFO  : projectplace : ################## Version: 10.0beta3
2022-09-13 08:38:09 : INFO  : projectplace : ################## Date: 2022-09-13
2022-09-13 08:38:09 : INFO  : projectplace : ################## projectplace
2022-09-13 08:38:09 : INFO  : projectplace : SwiftDialog is not installed, clear cmd file var
2022-09-13 08:38:09 : INFO  : projectplace : BLOCKING_PROCESS_ACTION=tell_user
2022-09-13 08:38:09 : INFO  : projectplace : NOTIFY=success
2022-09-13 08:38:09 : INFO  : projectplace : LOGGING=INFO
2022-09-13 08:38:09 : INFO  : projectplace : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2022-09-13 08:38:09 : INFO  : projectplace : Label type: dmg
2022-09-13 08:38:09 : INFO  : projectplace : archiveName: Projectplace.dmg
2022-09-13 08:38:09 : INFO  : projectplace : no blocking processes defined, using Projectplace as default
2022-09-13 08:38:10 : INFO  : projectplace : name: Projectplace, appName: Projectplace.app
2022-09-13 08:38:10 : WARN  : projectplace : No previous app found
2022-09-13 08:38:10 : WARN  : projectplace : could not find Projectplace.app
2022-09-13 08:38:10 : INFO  : projectplace : appversion:
2022-09-13 08:38:10 : INFO  : projectplace : Latest version not specified.
2022-09-13 08:38:10 : REQ   : projectplace : Downloading https://service.projectplace.com/client_apps/desktop/Projectplace-for-mac.dmg to Projectplace.dmg
2022-09-13 08:38:11 : REQ   : projectplace : no more blocking processes, continue with update
2022-09-13 08:38:11 : REQ   : projectplace : Installing Projectplace
2022-09-13 08:38:11 : INFO  : projectplace : Mounting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.DSQ0lE6Y/Projectplace.dmg
2022-09-13 08:38:14 : INFO  : projectplace : Mounted: /Volumes/Projectplace
2022-09-13 08:38:14 : INFO  : projectplace : Verifying: /Volumes/Projectplace/Projectplace.app
2022-09-13 08:38:15 : INFO  : projectplace : Team ID matching: 8333HW99E8 (expected: 8333HW99E8 )
2022-09-13 08:38:15 : INFO  : projectplace : Installing Projectplace version 1.3.5 on versionKey CFBundleShortVersionString.
2022-09-13 08:38:15 : INFO  : projectplace : Copy /Volumes/Projectplace/Projectplace.app to /Applications
2022-09-13 08:38:15 : WARN  : projectplace : Changing owner to kryptonit
2022-09-13 08:38:15 : INFO  : projectplace : Finishing...
2022-09-13 08:38:18 : INFO  : projectplace : App(s) found: /Applications/Projectplace.app
2022-09-13 08:38:18 : INFO  : projectplace : found app at /Applications/Projectplace.app, version 1.3.5, on versionKey CFBundleShortVersionString
2022-09-13 08:38:18 : REQ   : projectplace : Installed Projectplace, version 1.3.5
2022-09-13 08:38:18 : INFO  : projectplace : notifying
2022-09-13 08:38:19 : INFO  : projectplace : App not closed, so no reopen.
2022-09-13 08:38:19 : REQ   : projectplace : All done!
2022-09-13 08:38:19 : REQ   : projectplace : ################## End Installomator, exit code 0
---
 fragments/labels/projectplace.sh | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 fragments/labels/projectplace.sh

diff --git a/fragments/labels/projectplace.sh b/fragments/labels/projectplace.sh
new file mode 100644
index 0000000..c356581
--- /dev/null
+++ b/fragments/labels/projectplace.sh
@@ -0,0 +1,6 @@
+projectplace)
+    name="Projectplace"
+    type="dmg"
+    downloadURL="https://service.projectplace.com/client_apps/desktop/Projectplace-for-mac.dmg"
+    expectedTeamID="8333HW99E8"
+    ;;

From 57fd2e57fcbab820741dd926886bcff8bd1d4d05 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Mon, 3 Oct 2022 13:03:46 +0200
Subject: [PATCH 05/39] vysor label

[https://github.com/koush/vysor.io](https://github.com/koush/vysor.io)

Vysor - Mirror and Control your Phone
---
 fragments/labels/vysor.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 fragments/labels/vysor.sh

diff --git a/fragments/labels/vysor.sh b/fragments/labels/vysor.sh
new file mode 100644
index 0000000..0a8710e
--- /dev/null
+++ b/fragments/labels/vysor.sh
@@ -0,0 +1,7 @@
+vysor)
+    name="Vysor"
+    type="zip"
+    downloadURL="$(downloadURLFromGit koush vysor.io)"
+    appNewVersion="$(versionFromGit koush vysor.io)"
+    expectedTeamID="XT4C9EJNUG"
+    ;;

From 3c8a4ff0674f5e5e7e4530dfb53423bfe4952958 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Tue, 4 Oct 2022 20:58:01 +0200
Subject: [PATCH 06/39] Create venturablocker.sh
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

```
2022-10-04 20:54:54 : INFO  : venturablocker : setting variable from argument DEBUG=2
2022-10-04 20:54:54 : REQ   : venturablocker : ################## Start Installomator v. 10.0beta3, date 2022-10-04
2022-10-04 20:54:54 : INFO  : venturablocker : ################## Version: 10.0beta3
2022-10-04 20:54:54 : INFO  : venturablocker : ################## Date: 2022-10-04
2022-10-04 20:54:54 : INFO  : venturablocker : ################## venturablocker
2022-10-04 20:54:54 : DEBUG : venturablocker : DEBUG mode 2 enabled.
2022-10-04 20:54:56 : DEBUG : venturablocker : name=venturablocker
2022-10-04 20:54:56 : DEBUG : venturablocker : appName=
2022-10-04 20:54:56 : DEBUG : venturablocker : type=pkg
2022-10-04 20:54:56 : DEBUG : venturablocker : archiveName=
2022-10-04 20:54:56 : DEBUG : venturablocker : downloadURL=https://github.com/Theile/venturablocker/releases/download/v20221004/venturablocker-20221004.pkg
2022-10-04 20:54:56 : DEBUG : venturablocker : curlOptions=
2022-10-04 20:54:56 : DEBUG : venturablocker : appNewVersion=20221004
2022-10-04 20:54:56 : DEBUG : venturablocker : appCustomVersion function: Not defined
2022-10-04 20:54:56 : DEBUG : venturablocker : versionKey=CFBundleShortVersionString
2022-10-04 20:54:56 : DEBUG : venturablocker : packageID=dk.envo-it.venturablocker
2022-10-04 20:54:56 : DEBUG : venturablocker : pkgName=
2022-10-04 20:54:56 : DEBUG : venturablocker : choiceChangesXML=
2022-10-04 20:54:56 : DEBUG : venturablocker : expectedTeamID=FXW6QXBFW5
2022-10-04 20:54:56 : DEBUG : venturablocker : blockingProcesses=
2022-10-04 20:54:56 : DEBUG : venturablocker : installerTool=
2022-10-04 20:54:56 : DEBUG : venturablocker : CLIInstaller=
2022-10-04 20:54:56 : DEBUG : venturablocker : CLIArguments=
2022-10-04 20:54:56 : DEBUG : venturablocker : updateTool=
2022-10-04 20:54:56 : DEBUG : venturablocker : updateToolArguments=
2022-10-04 20:54:56 : DEBUG : venturablocker : updateToolRunAsCurrentUser=
2022-10-04 20:54:56 : INFO  : venturablocker : BLOCKING_PROCESS_ACTION=tell_user
2022-10-04 20:54:56 : INFO  : venturablocker : NOTIFY=success
2022-10-04 20:54:56 : INFO  : venturablocker : LOGGING=DEBUG
2022-10-04 20:54:56 : INFO  : venturablocker : LOGO=/System/Applications/App Store.app/Contents/Resources/AppIcon.icns
2022-10-04 20:54:56 : INFO  : venturablocker : Label type: pkg
2022-10-04 20:54:56 : INFO  : venturablocker : archiveName: venturablocker.pkg
2022-10-04 20:54:56 : INFO  : venturablocker : no blocking processes defined, using venturablocker as default
2022-10-04 20:54:56 : DEBUG : venturablocker : Changing directory to /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.nLLDwJfl
2022-10-04 20:54:56 : INFO  : venturablocker : No version found using packageID dk.envo-it.venturablocker
2022-10-04 20:54:56 : INFO  : venturablocker : name: venturablocker, appName: venturablocker.app
2022-10-04 20:54:56.273 mdfind[91898:6894403] [UserQueryParser] Loading keywords and predicates for locale "en_US"
2022-10-04 20:54:56.274 mdfind[91898:6894403] [UserQueryParser] Loading keywords and predicates for locale "en"
2022-10-04 20:54:56.323 mdfind[91898:6894403] Couldn't determine the mapping between prefab keywords and predicates.
2022-10-04 20:54:56 : WARN  : venturablocker : No previous app found
2022-10-04 20:54:56 : WARN  : venturablocker : could not find venturablocker.app
2022-10-04 20:54:56 : INFO  : venturablocker : appversion:
2022-10-04 20:54:56 : INFO  : venturablocker : Latest version of venturablocker is 20221004
2022-10-04 20:54:56 : REQ   : venturablocker : Downloading https://github.com/Theile/venturablocker/releases/download/v20221004/venturablocker-20221004.pkg to venturablocker.pkg
2022-10-04 20:54:56 : DEBUG : venturablocker : No Dialog connection, just download
2022-10-04 20:54:57 : DEBUG : venturablocker : File list: -rw-r--r--  1 root  wheel    44K Oct  4 20:54 venturablocker.pkg
2022-10-04 20:54:57 : DEBUG : venturablocker : File type: venturablocker.pkg: xar archive compressed TOC: 4475, SHA-1 checksum
2022-10-04 20:54:57 : DEBUG : venturablocker : curl output was:
*   Trying 140.82.121.3:443...
* Connected to github.com (140.82.121.3) port 443 (#0)
…
* Connection #1 to host objects.githubusercontent.com left intact

2022-10-04 20:54:57 : REQ   : venturablocker : no more blocking processes, continue with update
2022-10-04 20:54:57 : REQ   : venturablocker : Installing venturablocker
2022-10-04 20:54:57 : INFO  : venturablocker : Verifying: venturablocker.pkg
2022-10-04 20:54:57 : DEBUG : venturablocker : File list: -rw-r--r--  1 root  wheel    44K Oct  4 20:54 venturablocker.pkg
2022-10-04 20:54:57 : DEBUG : venturablocker : File type: venturablocker.pkg: xar archive compressed TOC: 4475, SHA-1 checksum
2022-10-04 20:54:57 : DEBUG : venturablocker : spctlOut is venturablocker.pkg: accepted
2022-10-04 20:54:57 : DEBUG : venturablocker : source=Notarized Developer ID
2022-10-04 20:54:57 : DEBUG : venturablocker : origin=Developer ID Installer: ENVO IT AS (FXW6QXBFW5)
2022-10-04 20:54:57 : INFO  : venturablocker : Team ID: FXW6QXBFW5 (expected: FXW6QXBFW5 )
2022-10-04 20:54:57 : DEBUG : venturablocker : Deleting /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.nLLDwJfl
2022-10-04 20:54:57 : DEBUG : venturablocker : Debugging enabled, Deleting tmpDir output was:
/var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.nLLDwJfl/venturablocker.pkg
2022-10-04 20:54:57 : DEBUG : venturablocker : /var/folders/zz/zyxvpxvq6csfxvn_n0000000000000/T/tmp.nLLDwJfl
2022-10-04 20:54:57 : INFO  : venturablocker : App not closed, so no reopen.
2022-10-04 20:54:57 : DEBUG : venturablocker : DEBUG mode 2 enabled, exiting
2022-10-04 20:54:57 : REQ   : venturablocker : ################## End Installomator, exit code 0
```
---
 fragments/labels/venturablocker.sh | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 fragments/labels/venturablocker.sh

diff --git a/fragments/labels/venturablocker.sh b/fragments/labels/venturablocker.sh
new file mode 100644
index 0000000..6027165
--- /dev/null
+++ b/fragments/labels/venturablocker.sh
@@ -0,0 +1,8 @@
+venturablocker)
+    name="venturablocker"
+    type="pkg"
+    packageID="dk.envo-it.venturablocker"
+    downloadURL=$(downloadURLFromGit Theile venturablocker )
+    appNewVersion=$(versionFromGit Theile venturablocker )
+    expectedTeamID="FXW6QXBFW5"
+    ;;

From ac874a9f282896e6d89dda539fc6c770f5dcc95e Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Thu, 6 Oct 2022 15:28:59 +0200
Subject: [PATCH 07/39] IBM Notifier
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

IBM for some reason is adding too much to the “tag” on Github, so they have “Version 2.9.1 Build 96” for the current latest version. That ends up being read as 2.9.196, and not only 2.9.1 that the app version is.

I upload this, so we have it ready, but not sure if `appNewVersion` should stay or be commented out.
---
 fragments/labels/ibmnotifier.sh | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 fragments/labels/ibmnotifier.sh

diff --git a/fragments/labels/ibmnotifier.sh b/fragments/labels/ibmnotifier.sh
new file mode 100644
index 0000000..6f4844e
--- /dev/null
+++ b/fragments/labels/ibmnotifier.sh
@@ -0,0 +1,7 @@
+ibmnotifier)
+    name="IBM Notifier"
+    type="zip"
+    downloadURL="$(downloadURLFromGit IBM mac-ibm-notifications)"
+    appNewVersion="$(versionFromGit IBM mac-ibm-notifications)"
+    expectedTeamID="PETKK2G752"
+    ;;

From 7dabe54f18c33714dc0433feadb2896f5f8deb4e Mon Sep 17 00:00:00 2001
From: "Dan K. Snelson" <dan@snelson.us>
Date: Thu, 6 Oct 2022 11:17:03 -0600
Subject: [PATCH 08/39] Omit ' - ' when used with switftDialog

---
 fragments/functions.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fragments/functions.sh b/fragments/functions.sh
index bbd6bed..ef8e232 100644
--- a/fragments/functions.sh
+++ b/fragments/functions.sh
@@ -1018,7 +1018,7 @@ updateDialog() {
             echo "progress: $progress" >> $cmd_file
         fi
         if [[ $message != "" ]]; then
-            echo "progresstext: $name - $message" >> $cmd_file
+            echo "progresstext: $message" >> $cmd_file
         fi
     else
         # list item has a value, so we update the progress and text in the list

From e88e2a56ea4a376987cfc03e673939cb727915f8 Mon Sep 17 00:00:00 2001
From: Pro4TLZZ <github@pro4tlzz.com>
Date: Fri, 7 Oct 2022 10:06:36 +0100
Subject: [PATCH 09/39] Add fragments/labels/logitechoptionsplus.sh

Add label for Logitech Options+
---
 fragments/labels/logitechoptionsplus.sh | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 fragments/labels/logitechoptionsplus.sh

diff --git a/fragments/labels/logitechoptionsplus.sh b/fragments/labels/logitechoptionsplus.sh
new file mode 100644
index 0000000..62fe8b9
--- /dev/null
+++ b/fragments/labels/logitechoptionsplus.sh
@@ -0,0 +1,11 @@
+logitechoptionsplus)
+    name="Logi Options+"
+    archiveName="logioptionsplus_installer.zip"
+    appName="logioptionsplus_installer.app"
+    type="zip"
+    downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/optionsplus/logioptionsplus_installer.zip"
+    appNewVersion=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -B 5 -ie "https.*/.*/optionsplus/.*\.zip" | grep "Software Version" | sed 's/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]//g' | grep -ioe "Software Version.*[0-9.]*" | tr "/" "\n" | grep -oe "[0-9.]*" | head -1)
+    CLIInstaller="logioptionsplus_installer.app/Contents/MacOS/logioptionsplus_installer"
+    CLIArguments=(--quiet)
+    expectedTeamID="QED4VVPZWA"
+    ;;
\ No newline at end of file

From 69c959c923c0756263d31d69074e186a6a363ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aky=20Martinez?= <inaky.martinez@teamlewis.com>
Date: Tue, 11 Oct 2022 09:54:23 +0200
Subject: [PATCH 10/39] Create lucid.sh

---
 fragments/labels/lucid.sh | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 fragments/labels/lucid.sh

diff --git a/fragments/labels/lucid.sh b/fragments/labels/lucid.sh
new file mode 100644
index 0000000..54b1689
--- /dev/null
+++ b/fragments/labels/lucid.sh
@@ -0,0 +1,39 @@
+lucid)
+    name="lucid-2.1.4032"
+    type="pkg"
+    packageID="com.lucidlink
+org.mantle.Mantle
+Lucid.app/Contents/Frameworks/Mantle.framework
+com.lucidlink.build.helper.Renderer
+Lucid.app/Contents/Frameworks/Lucid
+com.lucidlink.lucidfs
+Lucid.app/Contents/Resources/lucidfs/lucidfs.fs
+com.lucidlink.build.helper
+Lucid.app/Contents/Frameworks/Lucid
+com.lucidlink.lucidfs.frameworks.lucidfs
+Lucid.app/Contents/Resources/lucidfs/lucidfs.fs/Contents/Frameworks/LucidFS.framework
+com.github.Electron.framework
+Lucid.app/Contents/Frameworks/Electron
+com.lucidlink.build.helper.GPU
+Lucid.app/Contents/Frameworks/Lucid
+com.lucidlink.lucidfs.filesystems.lucidfs
+Lucid.app/Contents/Resources/lucidfs/lucidfs.fs/Contents/Resources/mount_lucidfs.app/Contents/Extensions/10.12/lucidfs.kext
+com.lucidlink.build
+Lucid.app/Contents/Resources/ProxyResolver.app
+com.lucidlink.build.helper.Plugin
+Lucid.app/Contents/Frameworks/Lucid
+com.lucidlink.LucidFinderExt
+Lucid.app/Contents/PlugIns/LucidFinderExt.appex
+com.lucidlink
+Lucid.app
+org.reactivecocoa.ReactiveCocoa
+Lucid.app/Contents/Resources/ProxyResolver.app/Contents/Frameworks/ReactiveCocoa.framework
+com.lucidlink.lucidfs.Mounter
+Lucid.app/Contents/Resources/lucidfs/lucidfs.fs/Contents/Resources/mount_lucidfs.app
+com.github.Squirrel
+Lucid.app/Contents/Resources/ProxyResolver.app/Contents/Frameworks/Squirrel.framework"
+    downloadURL="https://d3il9duqikhdqy.cloudfront.net/latest/osx/lucid-2.1.4032.pkg"
+    appNewVersion=""
+    expectedTeamID="Y4KMJPU2B4"
+    blockingProcesses=( Lucid )
+    ;;

From 5d968b0816dd6f79c0de98d8f30d802a6b50761a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aky=20Martinez?= <inaky.martinez@teamlewis.com>
Date: Tue, 11 Oct 2022 10:30:39 +0200
Subject: [PATCH 11/39] Update lucid.sh

---
 fragments/labels/lucid.sh | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

diff --git a/fragments/labels/lucid.sh b/fragments/labels/lucid.sh
index 54b1689..870e663 100644
--- a/fragments/labels/lucid.sh
+++ b/fragments/labels/lucid.sh
@@ -1,39 +1,9 @@
 lucid)
     name="lucid-2.1.4032"
     type="pkg"
-    packageID="com.lucidlink
-org.mantle.Mantle
-Lucid.app/Contents/Frameworks/Mantle.framework
-com.lucidlink.build.helper.Renderer
-Lucid.app/Contents/Frameworks/Lucid
-com.lucidlink.lucidfs
-Lucid.app/Contents/Resources/lucidfs/lucidfs.fs
-com.lucidlink.build.helper
-Lucid.app/Contents/Frameworks/Lucid
-com.lucidlink.lucidfs.frameworks.lucidfs
-Lucid.app/Contents/Resources/lucidfs/lucidfs.fs/Contents/Frameworks/LucidFS.framework
-com.github.Electron.framework
-Lucid.app/Contents/Frameworks/Electron
-com.lucidlink.build.helper.GPU
-Lucid.app/Contents/Frameworks/Lucid
-com.lucidlink.lucidfs.filesystems.lucidfs
-Lucid.app/Contents/Resources/lucidfs/lucidfs.fs/Contents/Resources/mount_lucidfs.app/Contents/Extensions/10.12/lucidfs.kext
-com.lucidlink.build
-Lucid.app/Contents/Resources/ProxyResolver.app
-com.lucidlink.build.helper.Plugin
-Lucid.app/Contents/Frameworks/Lucid
-com.lucidlink.LucidFinderExt
-Lucid.app/Contents/PlugIns/LucidFinderExt.appex
-com.lucidlink
-Lucid.app
-org.reactivecocoa.ReactiveCocoa
-Lucid.app/Contents/Resources/ProxyResolver.app/Contents/Frameworks/ReactiveCocoa.framework
-com.lucidlink.lucidfs.Mounter
-Lucid.app/Contents/Resources/lucidfs/lucidfs.fs/Contents/Resources/mount_lucidfs.app
-com.github.Squirrel
-Lucid.app/Contents/Resources/ProxyResolver.app/Contents/Frameworks/Squirrel.framework"
+    packageID="com.lucidlink"
     downloadURL="https://d3il9duqikhdqy.cloudfront.net/latest/osx/lucid-2.1.4032.pkg"
-    appNewVersion=""
+    appNewVersion="2.1.4032"
     expectedTeamID="Y4KMJPU2B4"
     blockingProcesses=( Lucid )
     ;;

From a6263759063925d35b7509a3c279665948597c40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aky=20Martinez?= <inaky.martinez@teamlewis.com>
Date: Tue, 11 Oct 2022 13:07:25 +0200
Subject: [PATCH 12/39] Update lucid.sh

---
 fragments/labels/lucid.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/fragments/labels/lucid.sh b/fragments/labels/lucid.sh
index 870e663..88b2fca 100644
--- a/fragments/labels/lucid.sh
+++ b/fragments/labels/lucid.sh
@@ -1,9 +1,9 @@
 lucid)
-    name="lucid-2.1.4032"
+    name="lucid"
     type="pkg"
     packageID="com.lucidlink"
-    downloadURL="https://d3il9duqikhdqy.cloudfront.net/latest/osx/lucid-2.1.4032.pkg"
-    appNewVersion="2.1.4032"
+    downloadURL="https://www.lucidlink.com/download/latest/osx/stable/"
+    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
     expectedTeamID="Y4KMJPU2B4"
     blockingProcesses=( Lucid )
     ;;

From b1df3458147488b3e5d884bb353869bad4f97416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?I=C3=B1aky=20Martinez?= <inaky.martinez@teamlewis.com>
Date: Tue, 11 Oct 2022 14:23:09 +0200
Subject: [PATCH 13/39] Updated name

Updated name :)
---
 fragments/labels/{lucid.sh => lucidlink.sh} | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
 rename fragments/labels/{lucid.sh => lucidlink.sh} (89%)

diff --git a/fragments/labels/lucid.sh b/fragments/labels/lucidlink.sh
similarity index 89%
rename from fragments/labels/lucid.sh
rename to fragments/labels/lucidlink.sh
index 88b2fca..02a08fa 100644
--- a/fragments/labels/lucid.sh
+++ b/fragments/labels/lucidlink.sh
@@ -1,9 +1,9 @@
-lucid)
-    name="lucid"
+lucidlink)
+    name="lucidlink"
     type="pkg"
     packageID="com.lucidlink"
     downloadURL="https://www.lucidlink.com/download/latest/osx/stable/"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
     expectedTeamID="Y4KMJPU2B4"
     blockingProcesses=( Lucid )
-    ;;
+    ;;
\ No newline at end of file

From 651a5ce067c83530139cefd8c2a815e7226529cf Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Tue, 11 Oct 2022 20:40:36 +0200
Subject: [PATCH 14/39] Too many label names

`adobereaderdc` is now only that, as another label is `adobereaderdc-install`.
---
 fragments/labels/adobereaderdc.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/fragments/labels/adobereaderdc.sh b/fragments/labels/adobereaderdc.sh
index 48fd518..f123659 100644
--- a/fragments/labels/adobereaderdc.sh
+++ b/fragments/labels/adobereaderdc.sh
@@ -1,5 +1,4 @@
-adobereaderdc|\
-adobereaderdc-install)
+adobereaderdc)
     name="Adobe Acrobat Reader DC"
     type="pkgInDmg"
     packageID="com.adobe.acrobat.DC.reader.app.pkg.MUI"

From b5a51c3cbf141c7817bd974cad19ca6fcd177c41 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Wed, 12 Oct 2022 08:37:34 +0200
Subject: [PATCH 15/39] Update lucidlink.sh

`name` is now the name of the app. App has perfect values in it's version, so no need for `packageID`. Since `name` matches the name of the app, `blockingProcesses` comes for free.
---
 fragments/labels/lucidlink.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/fragments/labels/lucidlink.sh b/fragments/labels/lucidlink.sh
index 02a08fa..4f2313d 100644
--- a/fragments/labels/lucidlink.sh
+++ b/fragments/labels/lucidlink.sh
@@ -1,9 +1,8 @@
 lucidlink)
-    name="lucidlink"
+    name="Lucid"
+    # https://www.lucidlink.com/download
     type="pkg"
-    packageID="com.lucidlink"
     downloadURL="https://www.lucidlink.com/download/latest/osx/stable/"
     appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
     expectedTeamID="Y4KMJPU2B4"
-    blockingProcesses=( Lucid )
-    ;;
\ No newline at end of file
+    ;;

From 97f8b9ad260a78eef2771148875549adad2eee3b Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Wed, 12 Oct 2022 08:43:46 +0200
Subject: [PATCH 16/39] Revert "Too many label names"

This reverts commit 651a5ce067c83530139cefd8c2a815e7226529cf.
---
 fragments/labels/adobereaderdc.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fragments/labels/adobereaderdc.sh b/fragments/labels/adobereaderdc.sh
index f123659..48fd518 100644
--- a/fragments/labels/adobereaderdc.sh
+++ b/fragments/labels/adobereaderdc.sh
@@ -1,4 +1,5 @@
-adobereaderdc)
+adobereaderdc|\
+adobereaderdc-install)
     name="Adobe Acrobat Reader DC"
     type="pkgInDmg"
     packageID="com.adobe.acrobat.DC.reader.app.pkg.MUI"

From f75d7893227230a1d7ab8f2a1a07539d7bb6fb01 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Wed, 12 Oct 2022 10:11:04 +0200
Subject: [PATCH 17/39] `appNewVersion` fixed!

---
 fragments/labels/ibmnotifier.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fragments/labels/ibmnotifier.sh b/fragments/labels/ibmnotifier.sh
index 6f4844e..de8b247 100644
--- a/fragments/labels/ibmnotifier.sh
+++ b/fragments/labels/ibmnotifier.sh
@@ -2,6 +2,7 @@ ibmnotifier)
     name="IBM Notifier"
     type="zip"
     downloadURL="$(downloadURLFromGit IBM mac-ibm-notifications)"
-    appNewVersion="$(versionFromGit IBM mac-ibm-notifications)"
+    #appNewVersion="$(versionFromGit IBM mac-ibm-notifications)"
+    appNewVersion="$(curl -sLI "https://github.com/IBM/mac-ibm-notifications/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | cut -d "-" -f2 | sed 's/[^0-9\.]//g')"
     expectedTeamID="PETKK2G752"
     ;;

From b0bc3c3c816d12269bc236eed7ccd7a98d58817b Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Thu, 13 Oct 2022 14:29:53 +0200
Subject: [PATCH 18/39] Create subethaedit.sh

---
 fragments/labels/subethaedit.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 fragments/labels/subethaedit.sh

diff --git a/fragments/labels/subethaedit.sh b/fragments/labels/subethaedit.sh
new file mode 100644
index 0000000..86fef38
--- /dev/null
+++ b/fragments/labels/subethaedit.sh
@@ -0,0 +1,9 @@
+subethaedit)
+    name="SubEthaEdit"
+    # Home: https://github.com/subethaedit/SubEthaEdit
+    # Description: General purpose plain text editor for macOS. Widely known for its live collaboration feature.
+    type="zip"
+    downloadURL="$(downloadURLFromGit subethaedit SubEthaEdit)"
+    appNewVersion="$(versionFromGit subethaedit SubEthaEdit)"
+    expectedTeamID="S76GCAG929"
+    ;;

From 6ee318f655e9637f3615c63071c3c7be42c08b3a Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Thu, 13 Oct 2022 14:50:46 +0200
Subject: [PATCH 19/39] Create sublimemerge.sh

---
 fragments/labels/sublimemerge.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 fragments/labels/sublimemerge.sh

diff --git a/fragments/labels/sublimemerge.sh b/fragments/labels/sublimemerge.sh
new file mode 100644
index 0000000..37838cc
--- /dev/null
+++ b/fragments/labels/sublimemerge.sh
@@ -0,0 +1,9 @@
+sublimemerge)
+    # Home: https://www.sublimemerge.com
+    # Description: Git Client, done Sublime. Line-by-line Staging. Commit Editing. Unmatched Performance.
+    name="Sublime Merge"
+    type="zip"
+    downloadURL="$(curl -fs "https://www.sublimemerge.com/download_thanks?target=mac#direct-downloads" | grep -io "https://download.*_mac.zip" | head -1)"
+    appNewVersion=$(curl -fs https://www.sublimemerge.com/download | grep -i -A 4 "id.*changelog" | grep -io "Build [0-9]*")
+    expectedTeamID="Z6D26JE4Y4"
+    ;;

From c4fbcd6f3a801c37bf3be2a6d9d416c2169a847e Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 09:37:55 +0200
Subject: [PATCH 20/39] Update googleadseditor.sh

---
 fragments/labels/googleadseditor.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fragments/labels/googleadseditor.sh b/fragments/labels/googleadseditor.sh
index 9c2600b..6994f15 100644
--- a/fragments/labels/googleadseditor.sh
+++ b/fragments/labels/googleadseditor.sh
@@ -2,6 +2,8 @@ googleadseditor)
     name="Google Ads Editor"
     type="dmg"
     downloadURL="https://dl.google.com/adwords_editor/google_ads_editor.dmg"
-    appNewVersion=""
+    # Version not found in installed app, but on we it is here
+    #appNewVersion="$(curl -fs "https://support.google.com/google-ads/editor/answer/30513" | grep "Current Mac version" | sed -E 's/.*Current Mac version: *([0-9.]*)<.*/\1/')"
+    #appCustomVersion(){  }
     expectedTeamID="EQHXZ8M8AV"
     ;;

From 9ef19139d2ab8da98177984f53993bcc0d4a7e0c Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 09:50:26 +0200
Subject: [PATCH 21/39] Improved logging

---
 .../App VFA SS github.sh                              | 11 +++++++----
 .../App VFA SS.sh                                     | 11 +++++++----
 .../App browser-security SS.sh                        | 11 +++++++----
 .../App normal SS multi-app.sh                        | 11 +++++++----
 .../App normal SS.sh                                  | 11 +++++++----
 .../App service SS.sh                                 | 11 +++++++----
 6 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
index a235945..ec42027 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
@@ -134,8 +134,10 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-        echo "$warnOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
+        echo "$selectedOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
         echo "$cmdOutput"
@@ -177,8 +179,9 @@ caffexit () {
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
 if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
-    echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion."
-    echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)."
+    echo "Skipping swiftDialog UI, using notifications."
+    #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
+    #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
     installomatorNotify="NOTIFY=all"
 else
     installomatorNotify="NOTIFY=silent"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
index 2089f9b..ed36def 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
@@ -81,8 +81,10 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-        echo "$warnOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
+        echo "$selectedOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
         echo "$cmdOutput"
@@ -124,8 +126,9 @@ caffexit () {
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
 if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
-    echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion."
-    echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)."
+    echo "Skipping swiftDialog UI, using notifications."
+    #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
+    #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
     installomatorNotify="NOTIFY=all"
 else
     installomatorNotify="NOTIFY=silent"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
index 8e59aba..3efdfdd 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
@@ -72,8 +72,10 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-        echo "$warnOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
+        echo "$selectedOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
         echo "$cmdOutput"
@@ -115,8 +117,9 @@ caffexit () {
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
 if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
-    echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion."
-    echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)."
+    echo "Skipping swiftDialog UI, using notifications."
+    #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
+    #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
     installomatorNotify="NOTIFY=all"
 else
     installomatorNotify="NOTIFY=silent"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
index 0cc2af9..ce2d5f9 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
@@ -72,8 +72,10 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-        echo "$warnOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
+        echo "$selectedOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
         echo "$cmdOutput"
@@ -115,8 +117,9 @@ caffexit () {
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
 if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
-    echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion."
-    echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)."
+    echo "Skipping swiftDialog UI, using notifications."
+    #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
+    #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
     installomatorNotify="NOTIFY=all"
 else
     installomatorNotify="NOTIFY=silent"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
index 77f7add..49d374f 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
@@ -69,8 +69,10 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-        echo "$warnOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
+        echo "$selectedOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
         echo "$cmdOutput"
@@ -112,8 +114,9 @@ caffexit () {
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
 if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
-    echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion."
-    echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)."
+    echo "Skipping swiftDialog UI, using notifications."
+    #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
+    #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
     installomatorNotify="NOTIFY=all"
 else
     installomatorNotify="NOTIFY=silent"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
index 67d1f56..40aeb18 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
@@ -72,8 +72,10 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-        echo "$warnOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
+        echo "$selectedOutput"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
         echo "$cmdOutput"
@@ -115,8 +117,9 @@ caffexit () {
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
 if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
-    echo "Installomator should be at least version 10 to support Dialog. Installed version $installomatorVersion."
-    echo "And macOS 11 Big Sur (build 20A) is required for Dialog. Installed build $(sw_vers -buildVersion)."
+    echo "Skipping swiftDialog UI, using notifications."
+    #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
+    #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
     installomatorNotify="NOTIFY=all"
 else
     installomatorNotify="NOTIFY=silent"

From 8b19773a7fa249fa37d39193b3e9646d4cf8efc6 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 10:38:58 +0200
Subject: [PATCH 22/39] Correcting logging

---
 .../App VFA SS github.sh                                      | 4 +---
 .../App VFA SS.sh                                             | 4 +---
 .../App browser-security SS.sh                                | 4 +---
 .../App normal SS multi-app.sh                                | 4 +---
 .../App normal SS.sh                                          | 4 +---
 .../App service SS.sh                                         | 4 +---
 6 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
index ec42027..0130d46 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
@@ -134,9 +134,7 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
index ed36def..57a08db 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
@@ -81,9 +81,7 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
index 3efdfdd..7bddd7f 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
@@ -72,9 +72,7 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
index ce2d5f9..72c674c 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
@@ -72,9 +72,7 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
index 49d374f..0cf925c 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
@@ -69,9 +69,7 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
index 40aeb18..6d9ca83 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
@@ -72,9 +72,7 @@ checkCmdOutput () {
     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 "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": warn" || true )"
-        echo "$selectedOutput"
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i ": req" || true )"
+        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"

From 03177d4e9de1fb1fd668c94180e37a12a46f37ba Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 10:39:22 +0200
Subject: [PATCH 23/39] Get Installomator.log from client

---
 MDM/Collect Installomator.log.sh | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 MDM/Collect Installomator.log.sh

diff --git a/MDM/Collect Installomator.log.sh b/MDM/Collect Installomator.log.sh
new file mode 100644
index 0000000..c0af18d
--- /dev/null
+++ b/MDM/Collect Installomator.log.sh	
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# A small script to grab Installomator log from a client Mac.
+# Can be sent to the client so the result can be seen in MDM
+# Only uncomment the line below for the things you want to see.
+
+logFile="/var/log/Installomator.log"
+
+# Show latest 100 lines of the log
+tail -100 "${logFile}"
+
+# Show latest 500 lines but filter to REQ|ERROR|WARN lines
+# Great overview of the log
+#tail -500 "${logFile}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)"
+
+# Show only one label
+# Great to see everything for a label that might fail or not working as expected
+label="valuesfromarguments"
+#cat "${logFile}" | grep --binary-files=text ": ${label}"

From 2a0385d30dde2d51b2f479e3a58f593f8ca717fe Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 13:05:55 +0200
Subject: [PATCH 24/39] Check to see if Dialog CLI is also there

---
 MDM/Progress 1st swiftDialog.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MDM/Progress 1st swiftDialog.sh b/MDM/Progress 1st swiftDialog.sh
index f279d3d..7f7a98e 100755
--- a/MDM/Progress 1st swiftDialog.sh	
+++ b/MDM/Progress 1st swiftDialog.sh	
@@ -245,6 +245,7 @@ versionKey="CFBundleShortVersionString" #CFBundleVersion
 
 currentInstalledVersion="$(defaults read "${destFile}/Contents/Info.plist" $versionKey || true)"
 printlog "${name} version: $currentInstalledVersion"
+destFile="/usr/local/bin/dialog"
 if [[ ! -e "${destFile}" || "$currentInstalledVersion" != "$appNewVersion" ]]; then
     printlog "$name not found or version not latest."
     printlog "${destFile}"

From a7224fcbeafc6987b913bcf9293d60205682ca8b Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 13:07:19 +0200
Subject: [PATCH 25/39] Check to see if dialog CLI is also there

---
 MDM/install swiftDialog direct.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/MDM/install swiftDialog direct.sh b/MDM/install swiftDialog direct.sh
index c29d299..d318b2f 100755
--- a/MDM/install swiftDialog direct.sh	
+++ b/MDM/install swiftDialog direct.sh	
@@ -80,6 +80,7 @@ versionKey="CFBundleShortVersionString" #CFBundleVersion
 
 currentInstalledVersion="$(defaults read "${destFile}/Contents/Info.plist" $versionKey || true)"
 printlog "${name} version: $currentInstalledVersion"
+destFile="/usr/local/bin/dialog"
 if [[ ! -e "${destFile}" || "$currentInstalledVersion" != "$appNewVersion" ]]; then
     printlog "$name not found or version not latest."
     printlog "${destFile}"

From 2362e8a9d0a652ef0158cc4fe5af1895a26bc805 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Fri, 21 Oct 2022 14:01:59 +0200
Subject: [PATCH 26/39] Improved logging

---
 .../App VFA SS github.sh                      | 22 +++++++-------
 .../App VFA SS.sh                             | 29 ++++++++++---------
 .../App browser-security SS.sh                | 18 +++++-------
 .../App normal SS multi-app.sh                | 18 +++++-------
 .../App normal SS.sh                          | 18 +++++-------
 .../App service SS.sh                         | 18 +++++-------
 6 files changed, 57 insertions(+), 66 deletions(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
index 0130d46..da61b17 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
@@ -5,7 +5,7 @@
 
 LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
-#item="gfxcardstatus" # enter the software to install (if it has a label in future version of Installomator)
+item="gfxcardstatus" # enter the software to install (if it has a label in future version of Installomator)
 
 # Label variables below
 
@@ -129,19 +129,19 @@ dialogUpdate() {
     fi
 }
 checkCmdOutput () {
-    # $1: cmdOutput
-    local cmdOutput="$1"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    local checkOutput="$1"
+    exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
     if [[ ${exitStatus} -eq 0 ]] ; then
         echo "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+        selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
-        echo "$cmdOutput"
-        #errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+        echo "$checkOutput"
+        #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
         #echo "$errorOutput"
     fi
+    #echo "$checkOutput"
 }
 
 # Check the currently logged in user
@@ -295,7 +295,7 @@ fi
 
 # Install software using Installomator with valuesfromarguments
 cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
-    name=${name} \
+    name=\"${name}\" \
     type=${type} \
     packageID=${packageID} \
     downloadURL=\"$downloadURL\" \
@@ -304,7 +304,7 @@ cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
     expectedTeamID=${expectedTeamID} \
     ${installomatorOptions} ${installomatorNotify} || true)"
 
-checkCmdOutput $cmdOutput
+checkCmdOutput "${cmdOutput}"
 
 # Mark: dockutil stuff
 if [[ $addToDock -eq 1 ]]; then
@@ -323,9 +323,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -lt 10 ]]; then
-    echo "Again skipping Dialog stuff."
-else
+if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
index 57a08db..e4670ca 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
@@ -5,15 +5,14 @@
 
 LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
-#item="" # enter the software to install (if it has a label in future version of Installomator)
+item="clickshare" # enter the software to install (if it has a label in future version of Installomator)
 
 # Variables for label
-name="ClickShare"
+name="ClickShare" # Spaces in the name will not work
 type="appInDmgInZip"
 packageID=""
 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}")"
-versionKey=""
 expectedTeamID="P6CDJZR997"
 
 # Dialog icon
@@ -66,6 +65,10 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 echo "$(date +%F\ %T) [LOG-BEGIN] $item"
 
+if [[ -z "$item" ]]; then
+    item="$name"
+fi
+
 dialogUpdate() {
     # $1: dialog command
     local dcommand="$1"
@@ -76,24 +79,24 @@ dialogUpdate() {
     fi
 }
 checkCmdOutput () {
-    # $1: cmdOutput
-    local cmdOutput="$1"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    local checkOutput="$1"
+    exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
     if [[ ${exitStatus} -eq 0 ]] ; then
         echo "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+        selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
-        echo "$cmdOutput"
-        #errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+        echo "$checkOutput"
+        #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
         #echo "$errorOutput"
     fi
+    #echo "$checkOutput"
 }
 
 # Check the currently logged in user
 currentUser=$(stat -f "%Su" /dev/console)
-if [ -z "$currentUser" ] || [ "$currentUser" = "loginwindow" ] || [ "$currentUser" = "_mbsetupuser" ] || [ "$currentUser" = "root" ]; then
+if [[ -z "$currentUser" ]] || [[ "$currentUser" = "loginwindow" ]] || [[ "$currentUser" = "_mbsetupuser" ]] || [[ "$currentUser" = "root" ]]; then
     echo "ERROR. Logged in user is $currentUser! Cannot proceed."
     exit 97
 fi
@@ -251,7 +254,7 @@ cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
     expectedTeamID=${expectedTeamID} \
     ${installomatorOptions} ${installomatorNotify} || true)"
 
-checkCmdOutput $cmdOutput
+checkCmdOutput "${cmdOutput}"
 
 # Mark: dockutil stuff
 if [[ $addToDock -eq 1 ]]; then
@@ -270,9 +273,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -lt 10 ]]; then
-    echo "Again skipping Dialog stuff."
-else
+if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
index 7bddd7f..6e43de4 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
@@ -67,19 +67,19 @@ dialogUpdate() {
     fi
 }
 checkCmdOutput () {
-    # $1: cmdOutput
-    local cmdOutput="$1"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    local checkOutput="$1"
+    exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
     if [[ ${exitStatus} -eq 0 ]] ; then
         echo "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+        selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
-        echo "$cmdOutput"
-        #errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+        echo "$checkOutput"
+        #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
         #echo "$errorOutput"
     fi
+    #echo "$checkOutput"
 }
 
 # Check the currently logged in user
@@ -233,7 +233,7 @@ fi
 
 # Install software using Installomator
 cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
-checkCmdOutput $cmdOutput
+checkCmdOutput "${cmdOutput}"
 
 # Mark: dockutil stuff
 if [[ $addToDock -eq 1 ]]; then
@@ -252,9 +252,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -lt 10 ]]; then
-    echo "Again skipping Dialog stuff."
-else
+if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
index 72c674c..99e1e0a 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
@@ -67,19 +67,19 @@ dialogUpdate() {
     fi
 }
 checkCmdOutput () {
-    # $1: cmdOutput
-    local cmdOutput="$1"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    local checkOutput="$1"
+    exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
     if [[ ${exitStatus} -eq 0 ]] ; then
         echo "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+        selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
-        echo "$cmdOutput"
-        #errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+        echo "$checkOutput"
+        #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
         #echo "$errorOutput"
     fi
+    #echo "$checkOutput"
 }
 
 # Check the currently logged in user
@@ -233,7 +233,7 @@ fi
 
 # Install software using Installomator
 cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
-checkCmdOutput $cmdOutput
+checkCmdOutput "${cmdOutput}"
 
 # Mark: dockutil stuff
 if [[ $addToDock -eq 1 ]]; then
@@ -255,9 +255,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -lt 10 ]]; then
-    echo "Again skipping Dialog stuff."
-else
+if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
index 0cf925c..21ac560 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
@@ -64,19 +64,19 @@ dialogUpdate() {
     fi
 }
 checkCmdOutput () {
-    # $1: cmdOutput
-    local cmdOutput="$1"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    local checkOutput="$1"
+    exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
     if [[ ${exitStatus} -eq 0 ]] ; then
         echo "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+        selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
-        echo "$cmdOutput"
-        #errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+        echo "$checkOutput"
+        #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
         #echo "$errorOutput"
     fi
+    #echo "$checkOutput"
 }
 
 # Check the currently logged in user
@@ -230,7 +230,7 @@ fi
 
 # Install software using Installomator
 cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
-checkCmdOutput $cmdOutput
+checkCmdOutput "${cmdOutput}"
 
 # Mark: dockutil stuff
 if [[ $addToDock -eq 1 ]]; then
@@ -249,9 +249,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -lt 10 ]]; then
-    echo "Again skipping Dialog stuff."
-else
+if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
index 6d9ca83..c29debf 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
@@ -67,19 +67,19 @@ dialogUpdate() {
     fi
 }
 checkCmdOutput () {
-    # $1: cmdOutput
-    local cmdOutput="$1"
-    exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+    local checkOutput="$1"
+    exitStatus="$( echo "${checkOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
     if [[ ${exitStatus} -eq 0 ]] ; then
         echo "${item} succesfully installed."
-        selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+        selectedOutput="$( echo "${checkOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
         echo "$selectedOutput"
     else
         echo "ERROR installing ${item}. Exit code ${exitStatus}"
-        echo "$cmdOutput"
-        #errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+        echo "$checkOutput"
+        #errorOutput="$( echo "${checkOutput}" | grep --binary-files=text -i "error" || true )"
         #echo "$errorOutput"
     fi
+    #echo "$checkOutput"
 }
 
 # Check the currently logged in user
@@ -233,7 +233,7 @@ fi
 
 # Install software using Installomator
 cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} ${installomatorNotify} || true)"
-checkCmdOutput $cmdOutput
+checkCmdOutput "${cmdOutput}"
 
 # Mark: dockutil stuff
 if [[ $addToDock -eq 1 ]]; then
@@ -252,9 +252,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -lt 10 ]]; then
-    echo "Again skipping Dialog stuff."
-else
+if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"

From e22a7754bdc243700fae9d46230e85307fbf4273 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Mon, 24 Oct 2022 12:38:46 +0200
Subject: [PATCH 27/39] Improved logging

Overall purpose was to improve the logging in the scripts. But the handling of macOS version and Installomator version in order to utilize swiftDialog has been improved, too.
---
 .../App VFA SS github.sh                          | 15 ++++++++++++---
 .../App VFA SS.sh                                 | 15 ++++++++++-----
 .../App browser-security SS.sh                    |  5 +++--
 .../App normal SS multi-app.sh                    |  5 +++--
 .../App normal SS.sh                              |  5 +++--
 .../App service SS.sh                             |  5 +++--
 MDM/App-install/App VFA.sh                        | 13 +++++++++----
 .../App browser-security Auto-install.sh          |  1 +
 MDM/App-install/App browser-security SS.sh        |  5 +++--
 MDM/App-install/App normal Auto-install.sh        |  5 +++--
 MDM/App-install/App normal SS.sh                  |  5 +++--
 MDM/App-install/App service Auto-install.sh       |  5 +++--
 .../App browser-security Auto-install.sh          |  5 +++--
 MDM/App-update/App normal Auto-install.sh         |  5 +++--
 14 files changed, 62 insertions(+), 32 deletions(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
index da61b17..b664cf9 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
@@ -5,6 +5,10 @@
 
 LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
+# Have the label been submittet in a PR for Installomator?
+# What version of Installomator is it expected to be included in?
+# Version 10.0
+
 item="gfxcardstatus" # enter the software to install (if it has a label in future version of Installomator)
 
 # Label variables below
@@ -104,9 +108,10 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user DIALOG_CMD_FILE=${dial
 #   INSTALL=force
 ######################################################################
 # To be used as a script sent out from a MDM.
-# Fill the variable "item" above with a label.
+# Fill out the label variables above, and those will be included in the Installomator call, circa on line 248
 # Script will run this label through Installomator.
 ######################################################################
+# v. 10.0.3 : A bit more logging on succes, and change in ending Dialog part.
 # v. 10.0.2 : Improved icon checks and failovers
 # v. 10.0.1 : github-functions added. Improved appIcon handling. Can add the app to Dock using dockutil.
 # v. 10.0   : Integration with Dialog and Installomator v. 10
@@ -119,6 +124,10 @@ export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 echo "$(date +%F\ %T) [LOG-BEGIN] $item"
 
+if [[ -z "$item" ]]; then
+    item="$name"
+fi
+
 dialogUpdate() {
     # $1: dialog command
     local dcommand="$1"
@@ -176,7 +185,7 @@ caffexit () {
 # Mark: Installation begins
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
-if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
+if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion | cut -c1-2) -lt 20 ]]; then
     echo "Skipping swiftDialog UI, using notifications."
     #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
     #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
@@ -323,7 +332,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
+if [[ $installomatorVersion -ge 10 && $(sw_vers -buildVersion | cut -c1-2) -ge 20 ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
index e4670ca..aa0b228 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
@@ -5,10 +5,14 @@
 
 LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
+# Have the label been submittet in a PR for Installomator?
+# What version of Installomator is it expected to be included in?
+# Version 10.0
+
 item="clickshare" # enter the software to install (if it has a label in future version of Installomator)
 
 # Variables for label
-name="ClickShare" # Spaces in the name will not work
+name="ClickShare" # If spaces in the name, fill out "${name}" in Installomator-call below, circa line 249. Spaces should be escaped in that line.
 type="appInDmgInZip"
 packageID=""
 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" )"
@@ -50,9 +54,10 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user DIALOG_CMD_FILE=${dial
 #   INSTALL=force
 ######################################################################
 # To be used as a script sent out from a MDM.
-# Fill the variable "item" above with a label.
+# Fill out the label variables above, and those will be included in the Installomator call, circa on line 248
 # Script will run this label through Installomator.
 ######################################################################
+# v. 10.0.3 : A bit more logging on succes, and change in ending Dialog part.
 # v. 10.0.2 : Improved icon checks and failovers
 # v. 10.0.1 : Improved appIcon handling. Can add the app to Dock using dockutil
 # v. 10.0   : Integration with Dialog and Installomator v. 10
@@ -126,7 +131,7 @@ caffexit () {
 # Mark: Installation begins
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
-if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
+if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion | cut -c1-2) -lt 20 ]]; then
     echo "Skipping swiftDialog UI, using notifications."
     #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
     #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
@@ -245,7 +250,7 @@ fi
 
 # Install software using Installomator with valuesfromarguments
 cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
-    name=${name} \
+    name=\"${name}\" \
     type=${type} \
     packageID=${packageID} \
     downloadURL=\"$downloadURL\" \
@@ -273,7 +278,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
+if [[ $installomatorVersion -ge 10 && $(sw_vers -buildVersion | cut -c1-2) -ge 20 ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
index 6e43de4..5524428 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
@@ -45,6 +45,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user_then_quit DIALOG_CMD_FIL
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v. 10.0.3 : A bit more logging on succes, and change in ending Dialog part.
 # v. 10.0.2 : Improved icon checks and failovers
 # v. 10.0.1 : Improved appIcon handling. Can add the app to Dock using dockutil
 # v. 10.0   : Integration with Dialog and Installomator v. 10
@@ -114,7 +115,7 @@ caffexit () {
 # Mark: Installation begins
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
-if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
+if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion | cut -c1-2) -lt 20 ]]; then
     echo "Skipping swiftDialog UI, using notifications."
     #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
     #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
@@ -252,7 +253,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
+if [[ $installomatorVersion -ge 10 && $(sw_vers -buildVersion | cut -c1-2) -ge 20 ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
index 99e1e0a..839d091 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
@@ -45,6 +45,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user DIALOG_CMD_FILE=${dial
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v. 10.0.3 : A bit more logging on succes, and change in ending Dialog part.
 # v. 10.0.2 : Improved icon checks and failovers
 # v. 10.0.1 : Improved appIcon handling. Can add the app to Dock using dockutil
 # v. 10.0   : Integration with Dialog and Installomator v. 10
@@ -114,7 +115,7 @@ caffexit () {
 # Mark: Installation begins
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
-if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
+if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion | cut -c1-2) -lt 20 ]]; then
     echo "Skipping swiftDialog UI, using notifications."
     #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
     #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
@@ -255,7 +256,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
+iif [[ $installomatorVersion -ge 10 && $(sw_vers -buildVersion | cut -c1-2) -ge 20 ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
index 21ac560..77a03d4 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
@@ -42,6 +42,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user DIALOG_CMD_FILE=${dial
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v. 10.0.3 : A bit more logging on succes, and change in ending Dialog part.
 # v. 10.0.2 : Improved icon checks and failovers
 # v. 10.0.1 : Improved appIcon handling. Can add the app to Dock using dockutil
 # v. 10.0   : Integration with Dialog and Installomator v. 10
@@ -111,7 +112,7 @@ caffexit () {
 # Mark: Installation begins
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
-if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
+if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion | cut -c1-2) -lt 20 ]]; then
     echo "Skipping swiftDialog UI, using notifications."
     #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
     #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
@@ -249,7 +250,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
+if [[ $installomatorVersion -ge 10 && $(sw_vers -buildVersion | cut -c1-2) -ge 20 ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
index c29debf..d2c90bb 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
@@ -45,6 +45,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent DIALOG_CMD_FI
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v. 10.0.3 : A bit more logging on succes, and change in ending Dialog part.
 # v. 10.0.2 : Improved icon checks and failovers
 # v. 10.0.1 : Can add the app to Dock using dockutil
 # v. 10.0   : Integration with Dialog and Installomator v. 10
@@ -114,7 +115,7 @@ caffexit () {
 # Mark: Installation begins
 installomatorVersion="$(${destFile} version | cut -d "." -f1 || true)"
 
-if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion) < "20A" ]]; then
+if [[ $installomatorVersion -lt 10 ]] || [[ $(sw_vers -buildVersion | cut -c1-2) -lt 20 ]]; then
     echo "Skipping swiftDialog UI, using notifications."
     #echo "Installomator should be at least version 10 to support swiftDialog. Installed version $installomatorVersion."
     #echo "And macOS 11 Big Sur (build 20A) is required for swiftDialog. Installed build $(sw_vers -buildVersion)."
@@ -252,7 +253,7 @@ else
 fi
 
 # Mark: Ending
-if [[ $installomatorVersion -ge 10 ]] && [[ $(sw_vers -buildVersion) >= "20" ]]; then
+if [[ $installomatorVersion -ge 10 && $(sw_vers -buildVersion | cut -c1-2) -ge 20 ]]; then
     # close and quit dialog
     dialogUpdate "progress: complete"
     dialogUpdate "progresstext: Done"
diff --git a/MDM/App-install/App VFA.sh b/MDM/App-install/App VFA.sh
index 3162a67..ad9fd73 100755
--- a/MDM/App-install/App VFA.sh	
+++ b/MDM/App-install/App VFA.sh	
@@ -5,10 +5,14 @@
 
 LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
-#item="" # enter the software to install (if it has a label in future version of Installomator)
+# Have the label been submittet in a PR for Installomator?
+# What version of Installomator is it expected to be included in?
+# Version 10
+
+item="" # enter the software to install (if it has a label in future version of Installomator)
 
 # Variables for label
-name="ClickShare"
+name="ClickShare" # Spaces in the name will not work
 type="appInDmgInZip"
 packageID=""
 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" )"
@@ -40,6 +44,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user LOGGING=INFO NOTIFY=al
 # Fill the variable "what" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
@@ -84,8 +89,8 @@ cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
 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 "${what} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${what}. Exit code ${exitStatus}"
     echo "$cmdOutput"
diff --git a/MDM/App-install/App browser-security Auto-install.sh b/MDM/App-install/App browser-security Auto-install.sh
index c45b568..8dfd6d6 100644
--- a/MDM/App-install/App browser-security Auto-install.sh	
+++ b/MDM/App-install/App browser-security Auto-install.sh	
@@ -31,6 +31,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user_then_quit" # Separated b
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
diff --git a/MDM/App-install/App browser-security SS.sh b/MDM/App-install/App browser-security SS.sh
index 83c8b12..fac4e7b 100644
--- a/MDM/App-install/App browser-security SS.sh	
+++ b/MDM/App-install/App browser-security SS.sh	
@@ -31,6 +31,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user_then_quit NOTIFY=all" #
 # Fill the variable "what" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
@@ -65,8 +66,8 @@ cmdOutput="$(${destFile} ${what} LOGO=$LOGO ${installomatorOptions} || true)"
 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 "${what} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${what}. Exit code ${exitStatus}"
     echo "$cmdOutput"
diff --git a/MDM/App-install/App normal Auto-install.sh b/MDM/App-install/App normal Auto-install.sh
index 986b054..4e22dce 100644
--- a/MDM/App-install/App normal Auto-install.sh	
+++ b/MDM/App-install/App normal Auto-install.sh	
@@ -31,6 +31,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user" # Separated by space
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
@@ -65,8 +66,8 @@ cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true)"
 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 "${item} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${item}. Exit code ${exitStatus}"
     echo "$cmdOutput"
diff --git a/MDM/App-install/App normal SS.sh b/MDM/App-install/App normal SS.sh
index 06f7c04..8601f37 100644
--- a/MDM/App-install/App normal SS.sh	
+++ b/MDM/App-install/App normal SS.sh	
@@ -32,6 +32,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user NOTIFY=all" # Separate
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
@@ -66,8 +67,8 @@ cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true)"
 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 "${item} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${item}. Exit code ${exitStatus}"
     echo "$cmdOutput"
diff --git a/MDM/App-install/App service Auto-install.sh b/MDM/App-install/App service Auto-install.sh
index aa7165e..ef191e6 100644
--- a/MDM/App-install/App service Auto-install.sh	
+++ b/MDM/App-install/App service Auto-install.sh	
@@ -31,6 +31,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent" # Separated
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
@@ -65,8 +66,8 @@ cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true)"
 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 "${item} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${item}. Exit code ${exitStatus}"
     echo "$cmdOutput"
diff --git a/MDM/App-update/App browser-security Auto-install.sh b/MDM/App-update/App browser-security Auto-install.sh
index 211e564..53d5fd9 100644
--- a/MDM/App-update/App browser-security Auto-install.sh	
+++ b/MDM/App-update/App browser-security Auto-install.sh	
@@ -33,6 +33,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=tell_user_then_quit" # Separated b
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
@@ -77,8 +78,8 @@ cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true)"
 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 "${item} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${item}. Exit code ${exitStatus}"
     echo "$cmdOutput"
diff --git a/MDM/App-update/App normal Auto-install.sh b/MDM/App-update/App normal Auto-install.sh
index c2ac671..870c53a 100644
--- a/MDM/App-update/App normal Auto-install.sh	
+++ b/MDM/App-update/App normal Auto-install.sh	
@@ -33,6 +33,7 @@ installomatorOptions="BLOCKING_PROCESS_ACTION=prompt_user" # Separated by space
 # Fill the variable "item" above with a label.
 # Script will run this label through Installomator.
 ######################################################################
+# v.  9.2.2 : A bit more logging on succes.
 # v.  9.2.1 : Better logging handling and installomatorOptions fix.
 ######################################################################
 
@@ -77,8 +78,8 @@ cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true)"
 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 "${item} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${item}. Exit code ${exitStatus}"
     echo "$cmdOutput"

From dfc9950a3182f72ebcdcccc1db0848303ab7af2c Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Mon, 24 Oct 2022 12:39:04 +0200
Subject: [PATCH 28/39] Update App browser-security Auto-install.sh

---
 MDM/App-install/App browser-security Auto-install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/MDM/App-install/App browser-security Auto-install.sh b/MDM/App-install/App browser-security Auto-install.sh
index 8dfd6d6..c2c8a8b 100644
--- a/MDM/App-install/App browser-security Auto-install.sh	
+++ b/MDM/App-install/App browser-security Auto-install.sh	
@@ -66,8 +66,8 @@ cmdOutput="$(${destFile} ${item} LOGO=$LOGO ${installomatorOptions} || true)"
 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 "${item} succesfully installed."
-    warnOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "warn" || true )"
-    echo "$warnOutput"
+    selectedOutput="$( echo "${cmdOutput}" | grep --binary-files=text -E ": (REQ|ERROR|WARN)" || true )"
+    echo "$selectedOutput"
 else
     echo "ERROR installing ${item}. Exit code ${exitStatus}"
     echo "$cmdOutput"

From a8a1082d34526825f7eeb44835660045f896d5d2 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Mon, 24 Oct 2022 13:10:15 +0200
Subject: [PATCH 29/39] Final log-fixes

---
 .../App VFA SS github.sh                                      | 4 ++--
 .../App VFA SS.sh                                             | 4 ++--
 .../App browser-security SS.sh                                | 4 ++--
 .../App normal SS multi-app.sh                                | 4 ++--
 .../App normal SS.sh                                          | 4 ++--
 .../App service SS.sh                                         | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
index b664cf9..636ac1b 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
@@ -197,7 +197,7 @@ else
         echo "Cannot find dialog at $dialogApp"
         # Install using Installlomator
         cmdOutput="$(${destFile} dialog LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
 
     # Configure and display swiftDialog
@@ -322,7 +322,7 @@ if [[ $addToDock -eq 1 ]]; then
         echo "Cannot find dockutil at $dockutil, trying installation"
         # Install using Installlomator
         cmdOutput="$(${destFile} dockutil LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
     echo "Adding to Dock"
     $dockutil  --add "${appPath}" "${userHome}/Library/Preferences/com.apple.dock.plist" || true
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
index aa0b228..97a43cb 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
@@ -143,7 +143,7 @@ else
         echo "Cannot find dialog at $dialogApp"
         # Install using Installlomator
         cmdOutput="$(${destFile} dialog LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
 
     # Configure and display swiftDialog
@@ -268,7 +268,7 @@ if [[ $addToDock -eq 1 ]]; then
         echo "Cannot find dockutil at $dockutil, trying installation"
         # Install using Installlomator
         cmdOutput="$(${destFile} dockutil LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
     echo "Adding to Dock"
     $dockutil  --add "${appPath}" "${userHome}/Library/Preferences/com.apple.dock.plist" || true
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
index 5524428..a08b272 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
@@ -127,7 +127,7 @@ else
         echo "Cannot find dialog at $dialogApp"
         # Install using Installlomator
         cmdOutput="$(${destFile} dialog LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
 
     # Configure and display swiftDialog
@@ -243,7 +243,7 @@ if [[ $addToDock -eq 1 ]]; then
         echo "Cannot find dockutil at $dockutil, trying installation"
         # Install using Installlomator
         cmdOutput="$(${destFile} dockutil LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
     echo "Adding to Dock"
     $dockutil  --add "${appPath}" "${userHome}/Library/Preferences/com.apple.dock.plist" || true
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
index 839d091..6a114e0 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
@@ -127,7 +127,7 @@ else
         echo "Cannot find dialog at $dialogApp"
         # Install using Installlomator
         cmdOutput="$(${destFile} dialog LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
 
     # Configure and display swiftDialog
@@ -243,7 +243,7 @@ if [[ $addToDock -eq 1 ]]; then
         echo "Cannot find dockutil at $dockutil, trying installation"
         # Install using Installlomator
         cmdOutput="$(${destFile} dockutil LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
     echo "Adding to Dock"
     for appPath in "${appPaths[@]}"; do
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
index 77a03d4..7d4c231 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
@@ -124,7 +124,7 @@ else
         echo "Cannot find dialog at $dialogApp"
         # Install using Installlomator
         cmdOutput="$(${destFile} dialog LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
 
     # Configure and display swiftDialog
@@ -240,7 +240,7 @@ if [[ $addToDock -eq 1 ]]; then
         echo "Cannot find dockutil at $dockutil, trying installation"
         # Install using Installlomator
         cmdOutput="$(${destFile} dockutil LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
     echo "Adding to Dock"
     $dockutil  --add "${appPath}" "${userHome}/Library/Preferences/com.apple.dock.plist" || true
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
index d2c90bb..4e53575 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
@@ -127,7 +127,7 @@ else
         echo "Cannot find dialog at $dialogApp"
         # Install using Installlomator
         cmdOutput="$(${destFile} dialog LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
 
     # Configure and display swiftDialog
@@ -243,7 +243,7 @@ if [[ $addToDock -eq 1 ]]; then
         echo "Cannot find dockutil at $dockutil, trying installation"
         # Install using Installlomator
         cmdOutput="$(${destFile} dockutil LOGO=$LOGO BLOCKING_PROCESS_ACTION=ignore LOGGING=REQ NOTIFY=silent || true)"
-        checkCmdOutput $cmdOutput
+        checkCmdOutput "${cmdOutput}"
     fi
     echo "Adding to Dock"
     $dockutil  --add "${appPath}" "${userHome}/Library/Preferences/com.apple.dock.plist" || true

From afc906161acd2ee95c9965ae6bd239fe50ea4e1e Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Tue, 25 Oct 2022 10:48:52 +0200
Subject: [PATCH 30/39] Minor change in NOTIFY setting, that was missed

---
 .../App service SS.sh                                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
index 4e53575..9bacc2f 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
@@ -21,7 +21,7 @@ dialog_command_file="/var/tmp/dialog.log"
 dialogApp="/Library/Application Support/Dialog/Dialog.app"
 dockutil="/usr/local/bin/dockutil"
 
-installomatorOptions="BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent DIALOG_CMD_FILE=${dialog_command_file}" # Separated by space
+installomatorOptions="BLOCKING_PROCESS_ACTION=ignore DIALOG_CMD_FILE=${dialog_command_file}" # Separated by space
 
 # Other installomatorOptions:
 #   LOGGING=REQ

From 98f0fb1a7767939f8f7f96628dfcf2f826b04ea5 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Tue, 25 Oct 2022 20:57:11 +0200
Subject: [PATCH 31/39] Many fewer icon logs.

---
 .../App VFA SS github.sh                         | 16 ++++++++--------
 .../App VFA SS.sh                                | 16 ++++++++--------
 .../App browser-security SS.sh                   | 16 ++++++++--------
 .../App normal SS multi-app.sh                   | 16 ++++++++--------
 .../App normal SS.sh                             | 16 ++++++++--------
 .../App service SS.sh                            | 16 ++++++++--------
 6 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh
index 636ac1b..4b19b9c 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS github.sh	
@@ -210,24 +210,24 @@ else
     echo "$item $itemName"
     
     #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file)
-    echo "icon before check: $icon"
+    #echo "icon before check: $icon"
     if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != ""  ]]; then
-        echo "icon looks to be web-link"
+        #echo "icon looks to be web-link"
         if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then
-            echo "ERROR: Cannot download link. Reset icon."
+            echo "ERROR: Cannot download ${icon} link. Reset icon."
             icon=""
         fi
     elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
-        echo "icon looks to be a file"
+        #echo "icon looks to be a file"
         if [[ ! -a "${icon}" ]]; then
-            echo "ERROR: Cannot find file. Reset icon."
+            echo "ERROR: Cannot find icon file ${icon}. Reset icon."
             icon=""
         fi
     else
-        echo "ERROR: Cannot figure out icon. Reset icon."
+        echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
         icon=""
     fi
-    echo "icon after first check: $icon"
+    #echo "icon after first check: $icon"
     # If no icon defined we are trying to search for installed app icon
     if [[ "$icon" == "" ]]; then
         appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -236,7 +236,7 @@ else
             appIcon="${appIcon}.icns"
         fi
         icon="${appPath}/Contents/Resources/${appIcon}"
-        echo "Icon before file check: ${icon}"
+        #echo "Icon before file check: ${icon}"
         if [ ! -f "${icon}" ]; then
             # Using LOGO variable to show logo in swiftDialog
             case $LOGO in
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh
index 97a43cb..a1d6d7c 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App VFA SS.sh	
@@ -156,24 +156,24 @@ else
     echo "$item $itemName"
     
     #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file)
-    echo "icon before check: $icon"
+    #echo "icon before check: $icon"
     if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != ""  ]]; then
-        echo "icon looks to be web-link"
+        #echo "icon looks to be web-link"
         if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then
-            echo "ERROR: Cannot download link. Reset icon."
+            echo "ERROR: Cannot download ${icon} link. Reset icon."
             icon=""
         fi
     elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
-        echo "icon looks to be a file"
+        #echo "icon looks to be a file"
         if [[ ! -a "${icon}" ]]; then
-            echo "ERROR: Cannot find file. Reset icon."
+            echo "ERROR: Cannot find icon file ${icon}. Reset icon."
             icon=""
         fi
     else
-        echo "ERROR: Cannot figure out icon. Reset icon."
+        echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
         icon=""
     fi
-    echo "icon after first check: $icon"
+    #echo "icon after first check: $icon"
     # If no icon defined we are trying to search for installed app icon
     if [[ "$icon" == "" ]]; then
         appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -182,7 +182,7 @@ else
             appIcon="${appIcon}.icns"
         fi
         icon="${appPath}/Contents/Resources/${appIcon}"
-        echo "Icon before file check: ${icon}"
+        #echo "Icon before file check: ${icon}"
         if [ ! -f "${icon}" ]; then
             # Using LOGO variable to show logo in swiftDialog
             case $LOGO in
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh
index a08b272..5714f05 100755
--- a/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App browser-security SS.sh	
@@ -140,24 +140,24 @@ else
     echo "$item $itemName"
     
     #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file)
-    echo "icon before check: $icon"
+    #echo "icon before check: $icon"
     if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != ""  ]]; then
-        echo "icon looks to be web-link"
+        #echo "icon looks to be web-link"
         if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then
-            echo "ERROR: Cannot download link. Reset icon."
+            echo "ERROR: Cannot download ${icon} link. Reset icon."
             icon=""
         fi
     elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
-        echo "icon looks to be a file"
+        #echo "icon looks to be a file"
         if [[ ! -a "${icon}" ]]; then
-            echo "ERROR: Cannot find file. Reset icon."
+            echo "ERROR: Cannot find icon file ${icon}. Reset icon."
             icon=""
         fi
     else
-        echo "ERROR: Cannot figure out icon. Reset icon."
+        echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
         icon=""
     fi
-    echo "icon after first check: $icon"
+    #echo "icon after first check: $icon"
     # If no icon defined we are trying to search for installed app icon
     if [[ "$icon" == "" ]]; then
         appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -166,7 +166,7 @@ else
             appIcon="${appIcon}.icns"
         fi
         icon="${appPath}/Contents/Resources/${appIcon}"
-        echo "Icon before file check: ${icon}"
+        #echo "Icon before file check: ${icon}"
         if [ ! -f "${icon}" ]; then
             # Using LOGO variable to show logo in swiftDialog
             case $LOGO in
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh
index 6a114e0..ecbf825 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS multi-app.sh	
@@ -140,24 +140,24 @@ else
     echo "$item $itemName"
     
     #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file)
-    echo "icon before check: $icon"
+    #echo "icon before check: $icon"
     if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != ""  ]]; then
-        echo "icon looks to be web-link"
+        #echo "icon looks to be web-link"
         if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then
-            echo "ERROR: Cannot download link. Reset icon."
+            echo "ERROR: Cannot download ${icon} link. Reset icon."
             icon=""
         fi
     elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
-        echo "icon looks to be a file"
+        #echo "icon looks to be a file"
         if [[ ! -a "${icon}" ]]; then
-            echo "ERROR: Cannot find file. Reset icon."
+            echo "ERROR: Cannot find icon file ${icon}. Reset icon."
             icon=""
         fi
     else
-        echo "ERROR: Cannot figure out icon. Reset icon."
+        echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
         icon=""
     fi
-    echo "icon after first check: $icon"
+    #echo "icon after first check: $icon"
     # If no icon defined we are trying to search for installed app icon
     if [[ "$icon" == "" ]]; then
         appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -166,7 +166,7 @@ else
             appIcon="${appIcon}.icns"
         fi
         icon="${appPath}/Contents/Resources/${appIcon}"
-        echo "Icon before file check: ${icon}"
+        #echo "Icon before file check: ${icon}"
         if [ ! -f "${icon}" ]; then
             # Using LOGO variable to show logo in swiftDialog
             case $LOGO in
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh
index 7d4c231..9f31c1d 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App normal SS.sh	
@@ -137,24 +137,24 @@ else
     echo "$item $itemName"
     
     #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file)
-    echo "icon before check: $icon"
+    #echo "icon before check: $icon"
     if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != ""  ]]; then
-        echo "icon looks to be web-link"
+        #echo "icon looks to be web-link"
         if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then
-            echo "ERROR: Cannot download link. Reset icon."
+            echo "ERROR: Cannot download ${icon} link. Reset icon."
             icon=""
         fi
     elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
-        echo "icon looks to be a file"
+        #echo "icon looks to be a file"
         if [[ ! -a "${icon}" ]]; then
-            echo "ERROR: Cannot find file. Reset icon."
+            echo "ERROR: Cannot find icon file ${icon}. Reset icon."
             icon=""
         fi
     else
-        echo "ERROR: Cannot figure out icon. Reset icon."
+        echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
         icon=""
     fi
-    echo "icon after first check: $icon"
+    #echo "icon after first check: $icon"
     # If no icon defined we are trying to search for installed app icon
     if [[ "$icon" == "" ]]; then
         appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -163,7 +163,7 @@ else
             appIcon="${appIcon}.icns"
         fi
         icon="${appPath}/Contents/Resources/${appIcon}"
-        echo "Icon before file check: ${icon}"
+        #echo "Icon before file check: ${icon}"
         if [ ! -f "${icon}" ]; then
             # Using LOGO variable to show logo in swiftDialog
             case $LOGO in
diff --git a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh
index 9bacc2f..fde5e30 100644
--- a/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
+++ b/MDM/App-install SS with swiftDialog and dockutil/App service SS.sh	
@@ -140,24 +140,24 @@ else
     echo "$item $itemName"
     
     #Check icon (expecting beginning with “http” to be web-link and “/” to be disk file)
-    echo "icon before check: $icon"
+    #echo "icon before check: $icon"
     if [[ "$(echo ${icon} | grep -iE "^(http|ftp).*")" != ""  ]]; then
-        echo "icon looks to be web-link"
+        #echo "icon looks to be web-link"
         if ! curl -sfL --output /dev/null -r 0-0 "${icon}" ; then
-            echo "ERROR: Cannot download link. Reset icon."
+            echo "ERROR: Cannot download ${icon} link. Reset icon."
             icon=""
         fi
     elif [[ "$(echo ${icon} | grep -iE "^\/.*")" != "" ]]; then
-        echo "icon looks to be a file"
+        #echo "icon looks to be a file"
         if [[ ! -a "${icon}" ]]; then
-            echo "ERROR: Cannot find file. Reset icon."
+            echo "ERROR: Cannot find icon file ${icon}. Reset icon."
             icon=""
         fi
     else
-        echo "ERROR: Cannot figure out icon. Reset icon."
+        echo "ERROR: Cannot figure out icon ${icon}. Reset icon."
         icon=""
     fi
-    echo "icon after first check: $icon"
+    #echo "icon after first check: $icon"
     # If no icon defined we are trying to search for installed app icon
     if [[ "$icon" == "" ]]; then
         appPath=$(mdfind "kind:application AND name:$itemName" | head -1 || true)
@@ -166,7 +166,7 @@ else
             appIcon="${appIcon}.icns"
         fi
         icon="${appPath}/Contents/Resources/${appIcon}"
-        echo "Icon before file check: ${icon}"
+        #echo "Icon before file check: ${icon}"
         if [ ! -f "${icon}" ]; then
             # Using LOGO variable to show logo in swiftDialog
             case $LOGO in

From 8dbabec280c7ac801736098e38824177897a5311 Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Tue, 1 Nov 2022 12:33:11 +0100
Subject: [PATCH 32/39] Create ipvisionconnect.sh

---
 fragments/labels/ipvisionconnect.sh | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 fragments/labels/ipvisionconnect.sh

diff --git a/fragments/labels/ipvisionconnect.sh b/fragments/labels/ipvisionconnect.sh
new file mode 100644
index 0000000..fd6e9d6
--- /dev/null
+++ b/fragments/labels/ipvisionconnect.sh
@@ -0,0 +1,9 @@
+ipvisionconnect)
+    name="ipvision Connect"
+    type="dmg"
+    # Description: A softphone client from ipvision.dk
+    downloadStore="https://my.ipvision.dk/connect/"
+    downloadURL="${downloadStore}$(curl -fs "https://my.ipvision.dk/connect/" | grep osx | sort | tail -1 | cut -d '"' -f2)"
+    appNewVersion="$(curl -fs "${downloadStore}" | grep osx | sort | tail -1 | sed -E 's/.*ipvision_connect_([0-9_]*)_osx.*/\1/' | tr "_" ".")"
+    expectedTeamID="5RLWBLKGL2"
+    ;;

From 68d389ab7fcf1f22a3cd1cccbeba6600a72db0c4 Mon Sep 17 00:00:00 2001
From: Mark Skrzypczyk <mark@kheironmed.com>
Date: Tue, 1 Nov 2022 14:58:43 +0000
Subject: [PATCH 33/39] Update to include pkg name for each arch type

---
 fragments/labels/openvpnconnectv3.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/fragments/labels/openvpnconnectv3.sh b/fragments/labels/openvpnconnectv3.sh
index 6961e5d..79fe55f 100644
--- a/fragments/labels/openvpnconnectv3.sh
+++ b/fragments/labels/openvpnconnectv3.sh
@@ -2,6 +2,11 @@ openvpnconnectv3)
     # credit: @lotnix
     name="OpenVPN Connect"
     type="pkgInDmg"
+    if [[ $(arch) == "arm64" ]]; then
+        pkgName="/OpenVPN_Connect_[0-9_()]*_arm64_Installer_signed.pkg"
+    elif [[ $(arch) == "i386" ]]; then
+        pkgName="OpenVPN_Connect_[0-9_()]*_x86_64_Installer_signed.pkg"
+    fi
     downloadURL="https://openvpn.net/downloads/openvpn-connect-v3-macos.dmg"
     expectedTeamID="ACV7L3WCD8"
-    ;;
+    ;;
\ No newline at end of file

From dbcdea3a72de2b751925b607940d3ec29d2cef96 Mon Sep 17 00:00:00 2001
From: Mark Skrzypczyk <mark@kheironmed.com>
Date: Tue, 1 Nov 2022 14:59:44 +0000
Subject: [PATCH 34/39] add new line at EOF

---
 fragments/labels/openvpnconnectv3.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/fragments/labels/openvpnconnectv3.sh b/fragments/labels/openvpnconnectv3.sh
index 79fe55f..c8dcccb 100644
--- a/fragments/labels/openvpnconnectv3.sh
+++ b/fragments/labels/openvpnconnectv3.sh
@@ -9,4 +9,5 @@ openvpnconnectv3)
     fi
     downloadURL="https://openvpn.net/downloads/openvpn-connect-v3-macos.dmg"
     expectedTeamID="ACV7L3WCD8"
-    ;;
\ No newline at end of file
+    ;;
+    
\ No newline at end of file

From fa268675837761fecbbe8db49db51c7a2e45b17c Mon Sep 17 00:00:00 2001
From: macmangr <106015597+macmangr@users.noreply.github.com>
Date: Sat, 12 Nov 2022 17:46:21 +0100
Subject: [PATCH 35/39] Changed download link

Changed download link to grab the latest version
---
 fragments/labels/onscreencontrol.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/fragments/labels/onscreencontrol.sh b/fragments/labels/onscreencontrol.sh
index 1ad2cc0..b27c367 100644
--- a/fragments/labels/onscreencontrol.sh
+++ b/fragments/labels/onscreencontrol.sh
@@ -2,7 +2,8 @@ onscreencontrol)
     name="OnScreen Control"
     type="pkgInZip"
     packageID="com.LGSI.OnScreen-Control"
-    downloadURL=$(currentFileName=`curl -s https://lmu.lge.com/ExternalService/onscreencontrol/mac/2.0/OnScreenControlLatestVersion.txt` && echo https://lmu.lge.com/ExternalService/onscreencontrol/mac/2.0/"$currentFileName")
-    appNewVersion=$(curl -s https://lmu.lge.com/ExternalService/onscreencontrol/mac/2.0/OnScreenControlLatestVersion.txt | sed -E 's/.*_([0-9.]*)\.zip/\1/g')
+    releaseURL="https://www.lg.com/de/support/software-select-category-result?csSalesCode=34WK95U-W.AEU"
+    appNewVersion=$(curl -sf $releaseURL | grep -m 1 "Mac_OSC_" | sed -E 's/.*OSC_([0-9.]*).zip.*/\1/g')
+    downloadURL=$(curl -sf $releaseURL | grep -m 1 "Mac_OSC_" | sed "s|.*href=\"\(.*\)\" title.*|\\1|")
     expectedTeamID="5SKT5H4CPQ"
     ;;

From 8c853ddd30b4d93c1e677dea77dd64b6ad4fcb0f Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Tue, 15 Nov 2022 11:22:28 +0100
Subject: [PATCH 36/39] GitHub API call is now primary

---
 MDM/Installomator 1st Auto-install DEPNotify.sh | 11 ++++++-----
 MDM/Installomator 1st Auto-install.sh           | 11 ++++++-----
 MDM/Installomator 1st SS DEPNotify.sh           | 11 ++++++-----
 MDM/Installomator 1st SS.sh                     | 11 ++++++-----
 MDM/Jamf/00_PrepareInstall_SwiftDialog.sh       |  8 ++++----
 MDM/Progress 1st swiftDialog.sh                 | 11 ++++++-----
 MDM/install Installomator direct.sh             | 11 ++++++-----
 MDM/install swiftDialog direct.sh               | 11 ++++++-----
 8 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/MDM/Installomator 1st Auto-install DEPNotify.sh b/MDM/Installomator 1st Auto-install DEPNotify.sh
index 7baa737..e357923 100755
--- a/MDM/Installomator 1st Auto-install DEPNotify.sh	
+++ b/MDM/Installomator 1st Auto-install DEPNotify.sh	
@@ -54,7 +54,8 @@ errorMessage="A problem was encountered setting up this Mac. Please contact IT."
 #  https://github.com/Installomator/Installomator
 #
 ######################################################################
-scriptVersion="9.5"
+scriptVersion="9.6"
+# v.  9.6   : 2022-11-15 : GitHub API call is first, only try alternative if that fails.
 # v.  9.5   : 2022-09-21 : change of GitHub download
 # v.  9.4   : 2022-09-14 : downloadURL can fall back on GitHub API
 # v.  9.3   : 2022-08-29 : installomatorOptions in quotes and ignore blocking processes. Improved installation with looping if it fails, so it can try again. Improved GitHub handling. ws1 support.
@@ -207,11 +208,11 @@ gitusername="Installomator"
 gitreponame="Installomator"
 #printlog "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    printlog "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #printlog "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
diff --git a/MDM/Installomator 1st Auto-install.sh b/MDM/Installomator 1st Auto-install.sh
index 6dd9353..6cb382e 100755
--- a/MDM/Installomator 1st Auto-install.sh	
+++ b/MDM/Installomator 1st Auto-install.sh	
@@ -52,7 +52,8 @@ errorMessage="A problem was encountered setting up this Mac. Please contact IT."
 #  https://github.com/Installomator/Installomator
 #
 ######################################################################
-scriptVersion="9.5"
+scriptVersion="9.6"
+# v.  9.6   : 2022-11-15 : GitHub API call is first, only try alternative if that fails.
 # v.  9.5   : 2022-09-21 : change of GitHub download
 # v.  9.4   : 2022-09-14 : Making error message optional. downloadURL can fall back on GitHub API.
 # v.  9.3   : 2022-08-29 : installomatorOptions in quotes and ignore blocking processes. Improved installation with looping if it fails, so it can try again. Improved GitHub handling. ws1 support.
@@ -178,11 +179,11 @@ gitusername="Installomator"
 gitreponame="Installomator"
 #printlog "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    printlog "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #printlog "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
diff --git a/MDM/Installomator 1st SS DEPNotify.sh b/MDM/Installomator 1st SS DEPNotify.sh
index b911f79..ac163c4 100755
--- a/MDM/Installomator 1st SS DEPNotify.sh	
+++ b/MDM/Installomator 1st SS DEPNotify.sh	
@@ -54,7 +54,8 @@ errorMessage="A problem was encountered setting up this Mac. Please contact IT."
 #  https://github.com/Installomator/Installomator
 #
 ######################################################################
-scriptVersion="9.5"
+scriptVersion="9.6"
+# v.  9.6   : 2022-11-15 : GitHub API call is first, only try alternative if that fails.
 # v.  9.5   : 2022-09-21 : change of GitHub download
 # v.  9.4   : 2022-09-14 : downloadURL can fall back on GitHub API
 # v.  9.3   : 2022-08-29 : installomatorOptions in quotes and ignore blocking processes. Improved installation with looping if it fails, so it can try again. Improved GitHub handling. ws1 support.
@@ -207,11 +208,11 @@ gitusername="Installomator"
 gitreponame="Installomator"
 #printlog "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    printlog "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #printlog "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
diff --git a/MDM/Installomator 1st SS.sh b/MDM/Installomator 1st SS.sh
index e017831..c21a842 100755
--- a/MDM/Installomator 1st SS.sh	
+++ b/MDM/Installomator 1st SS.sh	
@@ -51,7 +51,8 @@ errorMessage="A problem was encountered setting up this Mac. Please contact IT."
 #  https://github.com/Installomator/Installomator
 #
 ######################################################################
-scriptVersion="9.5"
+scriptVersion="9.6"
+# v.  9.6   : 2022-11-15 : GitHub API call is first, only try alternative if that fails.
 # v.  9.5   : 2022-09-21 : change of GitHub download
 # v.  9.4   : 2022-09-14 : Making error message optional. downloadURL can fall back on GitHub API.
 # v.  9.3   : 2022-08-29 : installomatorOptions in quotes and ignore blocking processes. Improved installation with looping if it fails, so it can try again. Improved GitHub handling. ws1 support.
@@ -177,11 +178,11 @@ gitusername="Installomator"
 gitreponame="Installomator"
 #printlog "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    printlog "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #printlog "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
diff --git a/MDM/Jamf/00_PrepareInstall_SwiftDialog.sh b/MDM/Jamf/00_PrepareInstall_SwiftDialog.sh
index 84a1212..e04f4a1 100755
--- a/MDM/Jamf/00_PrepareInstall_SwiftDialog.sh
+++ b/MDM/Jamf/00_PrepareInstall_SwiftDialog.sh
@@ -54,11 +54,11 @@ gitusername="bartreardon"
 gitreponame="swiftDialog"
 #echo "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    echo "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #echo "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
diff --git a/MDM/Progress 1st swiftDialog.sh b/MDM/Progress 1st swiftDialog.sh
index 7f7a98e..2428cf7 100755
--- a/MDM/Progress 1st swiftDialog.sh	
+++ b/MDM/Progress 1st swiftDialog.sh	
@@ -86,7 +86,8 @@ errorMessage="A problem was encountered setting up this Mac. Please contact IT."
 #      Or fonts, like:
 #       "Apple SF Pro Font,/Library/Fonts/SF-Pro.ttf"
 ######################################################################
-scriptVersion="9.5"
+scriptVersion="9.6"
+# v.  9.6   : 2022-11-15 : GitHub API call is first, only try alternative if that fails.
 # v.  9.5   : 2022-09-21 : change of GitHub download
 # v.  9.4   : 2022-09-14 : downloadURL can fall back on GitHub API
 # v.  9.3   : 2022-08-29 : Logging changed for current version. Improved installation with looping if it fails, so it can try again. Improved GitHub handling.
@@ -230,11 +231,11 @@ gitusername="bartreardon"
 gitreponame="swiftDialog"
 #printlog "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    printlog "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #printlog "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
diff --git a/MDM/install Installomator direct.sh b/MDM/install Installomator direct.sh
index 352275e..be57683 100755
--- a/MDM/install Installomator direct.sh	
+++ b/MDM/install Installomator direct.sh	
@@ -16,7 +16,8 @@
 #  https://github.com/Installomator/Installomator
 #
 ######################################################################
-scriptVersion="9.5"
+scriptVersion="9.6"
+# v.  9.6   : 2022-11-15 : GitHub API call is first, only try alternative if that fails.
 # v.  9.5   : 2022-09-21 : change of GitHub download
 # v.  9.4   : 2022-09-14 : downloadURL can fall back on GitHub API
 # v.  9.3   : 2022-08-29 : Logging changed for current version. Improved installation with looping if it fails, so it can try again. Improved GitHub handling.
@@ -65,11 +66,11 @@ gitusername="Installomator"
 gitreponame="Installomator"
 #printlog "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    printlog "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #printlog "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')
diff --git a/MDM/install swiftDialog direct.sh b/MDM/install swiftDialog direct.sh
index d318b2f..0c11674 100755
--- a/MDM/install swiftDialog direct.sh	
+++ b/MDM/install swiftDialog direct.sh	
@@ -16,7 +16,8 @@
 #  https://github.com/Installomator/Installomator
 #
 ######################################################################
-scriptVersion="9.5"
+scriptVersion="9.6"
+# v.  9.6   : 2022-11-15 : GitHub API call is first, only try alternative if that fails.
 # v.  9.5   : 2022-09-21 : change of GitHub download
 # v.  9.4   : 2022-09-14 : downloadURL can fall back on GitHub API.
 # v.  9.3   : 2022-08-29 : Logging changed for current version. Improved installation with looping if it fails, so it can try again. Improved GitHub handling.
@@ -65,11 +66,11 @@ gitusername="bartreardon"
 gitreponame="swiftDialog"
 #printlog "$gitusername $gitreponame"
 filetype="pkg"
-#downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
-downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
 if [[ "$(echo $downloadURL | grep -ioE "https.*.$filetype")" == "" ]]; then
-    printlog "Trying GitHub API for download URL."
-    downloadURL=$(curl -sfL "https://api.github.com/repos/$gitusername/$gitreponame/releases/latest" | awk -F '"' "/browser_download_url/ && /$filetype\"/ { print \$4; exit }")
+    printlog "GitHub API failed, trying failover."
+    #downloadURL="https://github.com$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
+    downloadURL="https://github.com$(curl -sfL "$(curl -sfL "https://github.com/$gitusername/$gitreponame/releases/latest" | tr '"' "\n" | grep -i "expanded_assets" | head -1)" | tr '"' "\n" | grep -i "^/.*\/releases\/download\/.*\.$filetype" | head -1)"
 fi
 #printlog "$downloadURL"
 appNewVersion=$(curl -sLI "https://github.com/$gitusername/$gitreponame/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | sed 's/[^0-9\.]//g')

From fc33d2aaff1d374b2dd68e5e431ca52ad01f4a75 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 18 Nov 2022 11:20:17 +0100
Subject: [PATCH 37/39] better error message

---
 utils/test-pr.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/utils/test-pr.sh b/utils/test-pr.sh
index 526ee56..a6dc883 100755
--- a/utils/test-pr.sh
+++ b/utils/test-pr.sh
@@ -14,7 +14,9 @@ if ! gh pr checkout $pr_num -b "pr/$pr_num"; then
 fi
 
 if ! utils/assemble.sh $label; then
+    exitcode=$?
     echo "something went wrong, stopping here"
+    echo "exit code: $exitcode"
 else
     echo
     echo "All good!"

From b1dc94ad1df9189e82b213f92219cb17f43eb018 Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 18 Nov 2022 13:29:39 +0100
Subject: [PATCH 38/39] fixed files not ending in newline

---
 fragments/labels/logitechoptionsplus.sh | 2 +-
 fragments/labels/openvpnconnectv3.sh    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/fragments/labels/logitechoptionsplus.sh b/fragments/labels/logitechoptionsplus.sh
index 62fe8b9..eecc6ed 100644
--- a/fragments/labels/logitechoptionsplus.sh
+++ b/fragments/labels/logitechoptionsplus.sh
@@ -8,4 +8,4 @@ logitechoptionsplus)
     CLIInstaller="logioptionsplus_installer.app/Contents/MacOS/logioptionsplus_installer"
     CLIArguments=(--quiet)
     expectedTeamID="QED4VVPZWA"
-    ;;
\ No newline at end of file
+    ;;
diff --git a/fragments/labels/openvpnconnectv3.sh b/fragments/labels/openvpnconnectv3.sh
index c8dcccb..ee1cf1a 100644
--- a/fragments/labels/openvpnconnectv3.sh
+++ b/fragments/labels/openvpnconnectv3.sh
@@ -10,4 +10,3 @@ openvpnconnectv3)
     downloadURL="https://openvpn.net/downloads/openvpn-connect-v3-macos.dmg"
     expectedTeamID="ACV7L3WCD8"
     ;;
-    
\ No newline at end of file

From 88cd4114aef20213fe5fb3b3aea9b162ade06e2f Mon Sep 17 00:00:00 2001
From: Armin Briegel <1933192+scriptingosx@users.noreply.github.com>
Date: Fri, 18 Nov 2022 13:41:38 +0100
Subject: [PATCH 39/39] updated for release

---
 CHANGELOG.md         |  27 +++++++++++
 Installomator.sh     | 107 +++++++++++++++++++++++++++++++++++++++++--
 Labels.txt           |  11 +++++
 fragments/version.sh |   2 +-
 4 files changed, 142 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 28868c0..2e42240 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## v10
+
+- updates to MDM sample scripts (#738)
+- updates to Swift Dialog integration (#717)
+- documentation updates (#711)
+
+And everything from the betas ([beta1](https://github.com/Installomator/Installomator/releases/tag/v10beta1), [beta2](https://github.com/Installomator/Installomator/releases/tag/v10beta2), [beta3](https://github.com/Installomator/Installomator/releases/tag/v10beta3))
+
+- new labels:
+    - ibmnotifier (#716)
+    - ipvisionconnect (#749)
+    - logitechoptionsplus (#719)
+    - lucidlink (#722)
+    - mactex (#685)
+    - onscreencontrol (#581)
+    - projectplace (#688)
+    - subethaedit (#728)
+    - sublimemerge (#729)
+    - venturablocker (#712)
+    - vysor (#710)
+
+- updated labels:
+    - googleadseditor (#739)
+    - openvpnconnectv3 (#750)
+    - tunnelblick (#618)
+
+
 ## v10beta3
 
 - option to add item to dock if dockutil is installed (#701 requires dockutil https://github.com/kcrawford/dockutil )
diff --git a/Installomator.sh b/Installomator.sh
index 7d99648..cc77b95 100755
--- a/Installomator.sh
+++ b/Installomator.sh
@@ -322,8 +322,8 @@ if [[ $(/usr/bin/arch) == "arm64" ]]; then
         rosetta2=no
     fi
 fi
-VERSION="10.0beta3"
-VERSIONDATE="2022-10-03"
+VERSION="10.0"
+VERSIONDATE="2022-11-18"
 
 # MARK: Functions
 
@@ -1345,7 +1345,7 @@ updateDialog() {
             echo "progress: $progress" >> $cmd_file
         fi
         if [[ $message != "" ]]; then
-            echo "progresstext: $name - $message" >> $cmd_file
+            echo "progresstext: $message" >> $cmd_file
         fi
     else
         # list item has a value, so we update the progress and text in the list
@@ -3030,7 +3030,9 @@ googleadseditor)
     name="Google Ads Editor"
     type="dmg"
     downloadURL="https://dl.google.com/adwords_editor/google_ads_editor.dmg"
-    appNewVersion=""
+    # Version not found in installed app, but on we it is here
+    #appNewVersion="$(curl -fs "https://support.google.com/google-ads/editor/answer/30513" | grep "Current Mac version" | sed -E 's/.*Current Mac version: *([0-9.]*)<.*/\1/')"
+    #appCustomVersion(){  }
     expectedTeamID="EQHXZ8M8AV"
     ;;
 googlechrome)
@@ -3261,6 +3263,14 @@ ibarcoder)
     appNewVersion="$(curl -fs "https://cristallight.com/iBarcoder/" | grep -i version: | head -1 | awk '{print $2}')"
     expectedTeamID="JAXVB9AH9M"
     ;;
+ibmnotifier)
+    name="IBM Notifier"
+    type="zip"
+    downloadURL="$(downloadURLFromGit IBM mac-ibm-notifications)"
+    #appNewVersion="$(versionFromGit IBM mac-ibm-notifications)"
+    appNewVersion="$(curl -sLI "https://github.com/IBM/mac-ibm-notifications/releases/latest" | grep -i "^location" | tr "/" "\n" | tail -1 | cut -d "-" -f2 | sed 's/[^0-9\.]//g')"
+    expectedTeamID="PETKK2G752"
+    ;;
 icons)
     name="Icons"
     type="zip"
@@ -3354,6 +3364,15 @@ ipswupdater)
     appNewVersion=$(getJSONValue "$ipswupdaterVersions" "[0].version")
     expectedTeamID="YRW6NUGA63"
     ;;
+ipvisionconnect)
+    name="ipvision Connect"
+    type="dmg"
+    # Description: A softphone client from ipvision.dk
+    downloadStore="https://my.ipvision.dk/connect/"
+    downloadURL="${downloadStore}$(curl -fs "https://my.ipvision.dk/connect/" | grep osx | sort | tail -1 | cut -d '"' -f2)"
+    appNewVersion="$(curl -fs "${downloadStore}" | grep osx | sort | tail -1 | sed -E 's/.*ipvision_connect_([0-9_]*)_osx.*/\1/' | tr "_" ".")"
+    expectedTeamID="5RLWBLKGL2"
+    ;;
 istatmenus)
     # credit: AP Orlebeke (@apizz)
     name="iStat Menus"
@@ -3733,6 +3752,17 @@ logitechoptions)
     pkgName=LogiMgr.pkg
     expectedTeamID="QED4VVPZWA"
     ;;
+logitechoptionsplus)
+    name="Logi Options+"
+    archiveName="logioptionsplus_installer.zip"
+    appName="logioptionsplus_installer.app"
+    type="zip"
+    downloadURL="https://download01.logi.com/web/ftp/pub/techsupport/optionsplus/logioptionsplus_installer.zip"
+    appNewVersion=$(curl -fs "https://support.logi.com/api/v2/help_center/en-us/articles.json?label_names=webcontent=productdownload,webos=mac-macos-x-11.0" | tr "," "\n" | grep -A 10 "macOS" | grep -B 5 -ie "https.*/.*/optionsplus/.*\.zip" | grep "Software Version" | sed 's/\\u[0-9a-z][0-9a-z][0-9a-z][0-9a-z]//g' | grep -ioe "Software Version.*[0-9.]*" | tr "/" "\n" | grep -oe "[0-9.]*" | head -1)
+    CLIInstaller="logioptionsplus_installer.app/Contents/MacOS/logioptionsplus_installer"
+    CLIArguments=(--quiet)
+    expectedTeamID="QED4VVPZWA"
+    ;;
 logseq)
     name="Logseq"
     type="dmg"
@@ -3765,6 +3795,14 @@ lowprofile)
     appNewVersion="$(versionFromGit ninxsoft LowProfile)"
     expectedTeamID="7K3HVCLV7Z"
     ;;
+lucidlink)
+    name="Lucid"
+    # https://www.lucidlink.com/download
+    type="pkg"
+    downloadURL="https://www.lucidlink.com/download/latest/osx/stable/"
+    appNewVersion=$( curl -fsIL "${downloadURL}" | grep -i "^location" | awk '{print $2}' | sed -E 's/.*\/[a-zA-Z]*-([0-9.]*)\..*/\1/g' )
+    expectedTeamID="Y4KMJPU2B4"
+    ;;
 lucifer)
     # credit: Drew Diver (@grumpydrew on MacAdmins Slack)
     name="Lucifer"
@@ -3836,6 +3874,13 @@ macports)
     appCustomVersion(){ if [ -x /opt/local/bin/port ]; then /opt/local/bin/port version | awk '{print $2}'; else "0"; fi }
     expectedTeamID="QTA3A3B7F3"
     ;;
+mactex)
+    name="MacTeX"
+    appName="TeX Live Utility.app"
+    type="pkg"
+    downloadURL="https://mirror.ctan.org/systems/mac/mactex/MacTeX.pkg"
+    expectedTeamID="RBGCY5RJWM"
+    ;;
 malwarebytes)
     name="Malwarebytes"
     type="pkg"
@@ -4520,6 +4565,15 @@ onlyofficedesktop)
     appNewVersion=$(versionFromGit ONLYOFFICE DesktopEditors)
     expectedTeamID="2WH24U26GJ"
     ;;
+onscreencontrol)
+    name="OnScreen Control"
+    type="pkgInZip"
+    packageID="com.LGSI.OnScreen-Control"
+    releaseURL="https://www.lg.com/de/support/software-select-category-result?csSalesCode=34WK95U-W.AEU"
+    appNewVersion=$(curl -sf $releaseURL | grep -m 1 "Mac_OSC_" | sed -E 's/.*OSC_([0-9.]*).zip.*/\1/g')
+    downloadURL=$(curl -sf $releaseURL | grep -m 1 "Mac_OSC_" | sed "s|.*href=\"\(.*\)\" title.*|\\1|")
+    expectedTeamID="5SKT5H4CPQ"
+    ;;
 openvpnconnect)
     # credit: Erik Stam (@erikstam)
     name="OpenVPN"
@@ -4532,6 +4586,11 @@ openvpnconnectv3)
     # credit: @lotnix
     name="OpenVPN Connect"
     type="pkgInDmg"
+    if [[ $(arch) == "arm64" ]]; then
+        pkgName="/OpenVPN_Connect_[0-9_()]*_arm64_Installer_signed.pkg"
+    elif [[ $(arch) == "i386" ]]; then
+        pkgName="OpenVPN_Connect_[0-9_()]*_x86_64_Installer_signed.pkg"
+    fi
     downloadURL="https://openvpn.net/downloads/openvpn-connect-v3-macos.dmg"
     expectedTeamID="ACV7L3WCD8"
     ;;
@@ -4711,6 +4770,12 @@ proctortrack)
     downloadURL="https://storage.googleapis.com/verificientstatic/ProctortrackApp/Production/Proctortrack.zip"
     expectedTeamID="SNHZD6TJE6"
     ;;
+projectplace)
+    name="Projectplace"
+    type="dmg"
+    downloadURL="https://service.projectplace.com/client_apps/desktop/Projectplace-for-mac.dmg"
+    expectedTeamID="8333HW99E8"
+    ;;
 promiseutility|\
 promiseutilityr)
     name="Promise Utility"
@@ -5231,6 +5296,24 @@ strongsync)
     versionKey="CFBundleVersion"
     expectedTeamID="CH86M498V4"
     ;;
+subethaedit)
+    name="SubEthaEdit"
+    # Home: https://github.com/subethaedit/SubEthaEdit
+    # Description: General purpose plain text editor for macOS. Widely known for its live collaboration feature.
+    type="zip"
+    downloadURL="$(downloadURLFromGit subethaedit SubEthaEdit)"
+    appNewVersion="$(versionFromGit subethaedit SubEthaEdit)"
+    expectedTeamID="S76GCAG929"
+    ;;
+sublimemerge)
+    # Home: https://www.sublimemerge.com
+    # Description: Git Client, done Sublime. Line-by-line Staging. Commit Editing. Unmatched Performance.
+    name="Sublime Merge"
+    type="zip"
+    downloadURL="$(curl -fs "https://www.sublimemerge.com/download_thanks?target=mac#direct-downloads" | grep -io "https://download.*_mac.zip" | head -1)"
+    appNewVersion=$(curl -fs https://www.sublimemerge.com/download | grep -i -A 4 "id.*changelog" | grep -io "Build [0-9]*")
+    expectedTeamID="Z6D26JE4Y4"
+    ;;
 sublimetext)
     # credit: Søren Theilgaard (@theilgaard)
     name="Sublime Text"
@@ -5528,6 +5611,7 @@ tunnelblick)
     name="Tunnelblick"
     type="dmg"
     downloadURL=$(downloadURLFromGit TunnelBlick Tunnelblick )
+    appNewVersion=$(curl -sf https://github.com/Tunnelblick/Tunnelblick/releases | grep -m 1 "/Tunnelblick/Tunnelblick/releases/tag/" | sed -r 's/.*Tunnelblick ([^<]+).*/\1/')
     expectedTeamID="Z2SG5H3HC8"
     ;;
 typinator)
@@ -5604,6 +5688,14 @@ vanilla)
     downloadURL="https://macrelease.matthewpalmer.net/Vanilla.dmg"
     expectedTeamID="Z4JV2M65MH"
     ;;
+venturablocker)
+    name="venturablocker"
+    type="pkg"
+    packageID="dk.envo-it.venturablocker"
+    downloadURL=$(downloadURLFromGit Theile venturablocker )
+    appNewVersion=$(versionFromGit Theile venturablocker )
+    expectedTeamID="FXW6QXBFW5"
+    ;;
 veracrypt)
     name="VeraCrypt"
     type="pkgInDmg"
@@ -5673,6 +5765,13 @@ vscodium)
     expectedTeamID="C7S3ZQ2B8V"
     blockingProcesses=( Electron )
     ;;
+vysor)
+    name="Vysor"
+    type="zip"
+    downloadURL="$(downloadURLFromGit koush vysor.io)"
+    appNewVersion="$(versionFromGit koush vysor.io)"
+    expectedTeamID="XT4C9EJNUG"
+    ;;
 wacomdrivers)
     name="Wacom Desktop Center"
     type="pkgInDmg"
diff --git a/Labels.txt b/Labels.txt
index c8bad36..9211a58 100644
--- a/Labels.txt
+++ b/Labels.txt
@@ -198,6 +198,7 @@ hpeasystart
 hype
 hyper
 ibarcoder
+ibmnotifier
 icons
 idrive
 idrivethin
@@ -211,6 +212,7 @@ installomator
 installomator_theile
 intellijideace
 ipswupdater
+ipvisionconnect
 istatmenus
 iterm2
 itsycal
@@ -251,9 +253,11 @@ libreoffice
 linear
 logioptions
 logitechoptions
+logitechoptionsplus
 logseq
 loom
 lowprofile
+lucidlink
 lucifer
 lulu
 macadminspython
@@ -261,6 +265,7 @@ maccyapp
 macfuse
 macoslaps
 macports
+mactex
 malwarebytes
 marathon
 marathon2
@@ -331,6 +336,7 @@ omniplan4
 omnipresence
 onionshare
 onlyofficedesktop
+onscreencontrol
 openvpnconnect
 openvpnconnectv3
 opera
@@ -356,6 +362,7 @@ prism9
 pritunl
 privileges
 proctortrack
+projectplace
 promiseutility
 promiseutilityr
 propresenter7
@@ -429,6 +436,8 @@ sqlprostudio
 steelseriesengine
 strongdm
 strongsync
+subethaedit
+sublimemerge
 sublimetext
 superhuman
 supportapp
@@ -476,6 +485,7 @@ unnaturalscrollwheels
 utm
 vagrant
 vanilla
+venturablocker
 veracrypt
 vimac
 virtualbox
@@ -485,6 +495,7 @@ vivaldi
 vlc
 vmwarehorizonclient
 vscodium
+vysor
 wacomdrivers
 wallyezflash
 webex
diff --git a/fragments/version.sh b/fragments/version.sh
index a243768..2f52450 100644
--- a/fragments/version.sh
+++ b/fragments/version.sh
@@ -1 +1 @@
-10.0beta3
+10.0