From a68ac0d065f8cb69b5bd272bd55cdbb7de5f8bea Mon Sep 17 00:00:00 2001
From: Theile <soren@theilgaard.dk>
Date: Mon, 26 Sep 2022 15:45:51 +0200
Subject: [PATCH] Missing notification and other fields for Installomator call

---
 .../App VFA SS github.sh                                  | 8 ++++++--
 .../App VFA SS.sh                                         | 8 ++++++--
 2 files changed, 12 insertions(+), 4 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 8d9365d..a235945 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	
@@ -3,7 +3,7 @@
 # Installation using Installomator with Dialog showing progress (and posibility of adding to the Dock)
 # Installation of software using `valuesfromarguments` to install a custom software using Installomator through GitHub
 
-LOGO="mosyleb" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
+LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
 #item="gfxcardstatus" # enter the software to install (if it has a label in future version of Installomator)
 
@@ -63,8 +63,10 @@ versionFromGit() {
 # Variables for label
 name="gfxCardStatus"
 type="zip"
+packageID=""
 downloadURL="$(downloadURLFromGit codykrieger gfxCardStatus)"
 appNewVersion="$(versionFromGit codykrieger gfxCardStatus)"
+versionKey=""
 expectedTeamID="LF22FTQC25"
 
 # Dialog icon
@@ -294,10 +296,12 @@ fi
 cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
     name=${name} \
     type=${type} \
+    packageID=${packageID} \
     downloadURL=\"$downloadURL\" \
     appNewVersion=${appNewVersion} \
+    versionKey=${versionKey} \
     expectedTeamID=${expectedTeamID} \
-    ${installomatorOptions} || true)"
+    ${installomatorOptions} ${installomatorNotify} || true)"
 
 checkCmdOutput $cmdOutput
 
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 31cf097..e6dc82b 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	
@@ -3,15 +3,17 @@
 # Installation using Installomator with Dialog showing progress (and posibility of adding to the Dock)
 # Installation of software using `valuesfromarguments` to install a custom software using Installomator
 
-LOGO="mosyleb" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
+LOGO="" # "mosyleb", "mosylem", "addigy", "microsoft", "ws1"
 
 #item="" # enter the software to install (if it has a label in future version of Installomator)
 
 # Variables for label
 name="ClickShare"
 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
@@ -242,10 +244,12 @@ fi
 cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
     name=${name} \
     type=${type} \
+    packageID=${packageID} \
     downloadURL=\"$downloadURL\" \
     appNewVersion=${appNewVersion} \
+    versionKey=${versionKey} \
     expectedTeamID=${expectedTeamID} \
-    ${installomatorOptions} || true)"
+    ${installomatorOptions} ${installomatorNotify} || true)"
 
 checkCmdOutput $cmdOutput