From 77567cdf4e3a3c820a217425cf57d3020d376172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 28 Oct 2021 13:46:16 +0200
Subject: [PATCH] Update MDMAddigy CustomSoftware.sh

---
 MDM/MDMAddigy CustomSoftware.sh | 75 ++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 24 deletions(-)

diff --git a/MDM/MDMAddigy CustomSoftware.sh b/MDM/MDMAddigy CustomSoftware.sh
index 9d26a50..3cb867c 100755
--- a/MDM/MDMAddigy CustomSoftware.sh	
+++ b/MDM/MDMAddigy CustomSoftware.sh	
@@ -1,62 +1,89 @@
 #!/bin/zsh
 
 # Specific settings in Addigy to configure Custom Software for installomator.
-# Addigy has 3 parts to fill out for this, Installation script, Conditions, and Removal steps.
+# Addigy has 3 parts to fill out for this, Installation script, Condition, and Removal steps (see RemoveInstallomator.sh).
 
 # Mark: Installation script
-# Just click “Add” to the autogenerated script by clicking the “Add”-button next to the Installer PKG.
+# Just click “Add” to autogenerate the installer script line by clicking the “Add”-button next to the Installer PKG, replace with first line below
+/usr/sbin/installer -pkg "/Library/Addigy/ansible/packages/Installomator (0.7.0)/Installomator-0.7.0.pkg" -target /
 
-# Mark: Conditions
-# Remember to fill out the correct “TARGET_VERSION” and click "Install on succes".
-TARGET_VERSION="0.7.0"
+# Installation using Installomator
+what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the software to installed  separated with spaces
 
-APP="/usr/local/Installomator/Installomator.sh"
-if [ ! -f ${APP} ]; then
-    echo "Does not exist: ${APP}"
-    exit 0
+# To be used as a script sent out from a MDM.
+# Fill the variable "what" above with labels separated by space " ".
+# Script will loop through these labels and exit with number of errors.
+######################################################################
+
+# Count errors
+errorCount=0
+
+# Verify that Installomator has been installed
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    exit 99
 fi
 
-INSTALLED_VERSION="$(${APP} version | tail -1 | awk '{print $4}')"
+for item in $what; do
+    #echo $item
+    ${destFile} ${item} LOGO=addigy NOTIFY=silent BLOCKING_PROCESS_ACTION=quit_kill #INSTALL=force
+    if [ $? != 0 ]; then
+    # Error handling
+        echo "[$(DATE)] Error installing ${item}. Exit code $?"
+        let errorCount++
+        # exit $?
+    fi
+done
+
+echo
+echo "Errors: $errorCount"
+echo "[$(DATE)][LOG-END]"
+
+exit $errorCount
+
+# Mark: Conditions
+# Install on success
+# Remember to fill out the correct “TARGET_VERSION” and “PKG_ID”, and click "Install on succes".
+PKG_ID="com.scriptingosx.Installomator"
+TARGET_VERSION="0.7.0"
 
 vercomp () {
-    if [[ $1 == $2 ]]
-    then
+    if [[ $1 == $2 ]]; then
         return 0
     fi
     local IFS=.
     local i ver1=($1) ver2=($2)
     # fill empty fields in ver1 with zeros
-    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++))
-    do
+    for ((i=${#ver1[@]}; i<${#ver2[@]}; i++)); do
         ver1[i]=0
     done
-    for ((i=0; i<${#ver1[@]}; i++))
-    do
-        if [[ -z ${ver2[i]} ]]
-        then
+    for ((i=0; i<${#ver1[@]}; i++)); do
+        if [[ -z ${ver2[i]} ]]; then
             # fill empty fields in ver2 with zeros
             ver2[i]=0
         fi
-        if ((10#${ver1[i]} > 10#${ver2[i]}))
-        then
+        if ((10#${ver1[i]} > 10#${ver2[i]})); then
             return 1
         fi
-        if ((10#${ver1[i]} < 10#${ver2[i]}))
-        then
+        if ((10#${ver1[i]} < 10#${ver2[i]})); then
             return 2
         fi
     done
     return 0
 }
 
+INSTALLED_VERSION="$(pkgutil --pkg-info $PKG_ID | grep -i "^version" | awk '{print $2}')"
+
 echo "Current Version: ${INSTALLED_VERSION}"
 
 vercomp ${TARGET_VERSION} ${INSTALLED_VERSION}
 COMP=$? # 0 means the same, 1 means TARGET is newer, 2 means INSTALLED is newer
 echo "COMPARISON: ${COMP}"
 
-if [ "${COMP}" -eq 1 ]
-then
+if [ "${COMP}" -eq 1 ]; then
     echo "Installed version is older than ${TARGET_VERSION}."
     exit 0
 else