MDM scripts updated

MDM/Manual valuesfromarguments.sh

@@ -1,8 +1,20 @@
 #!/bin/bash
+# Software
+
 # Installation using Installomator
 # Example of installing software using valuesfromarguments to install a custom software
 
-what="valuesfromarguments" # enter the software to install
+LOGO="appstore" # or "addigy", "microsoft", "mosyleb", "mosylem"
+###############################################
+
+# Verify that Installomator has been installed
+destFile="/usr/local/Installomator/Installomator.sh"
+if [ ! -e "${destFile}" ]; then
+    echo "Installomator not found here:"
+    echo "${destFile}"
+    echo "Exiting."
+    exit 99
+fi
 
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
@@ -13,29 +25,31 @@ caffexit () {
     exit $1
 }
 
-# Verify that Installomator has been installed
-destFile="/usr/local/Installomator/Installomator.sh"
-if [ ! -e "${destFile}" ]; then
-    echo "Installomator not found here:"
-    echo "${destFile}"
-    echo "Exiting."
-    caffexit 99
-fi
+# Variables to calculate
+downloadURL="https://craft-assets.invisionapp.com/CraftManager/production/CraftManager.zip"
+appNewVersion=$(curl -fs https://craft-assets.invisionapp.com/CraftManager/production/appcast.xml | xpath -e '//rss/channel/item[1]/enclosure/@sparkle:shortVersionString' 2>/dev/null | cut -d '"' -f2)
 
-${destFile} valuesfromarguments \
-            name=\"Zoho\ WorkDrive\" \
-            type=dmg \
-            downloadURL=https://files-accl.zohopublic.com/public/wdbin/download/46f971e4fc4a32b68ad5d7dade38a7d2 \
-            appNewVersion=2.6.25 \
-            expectedTeamID=TZ824L8Y37 \
-            BLOCKING_PROCESS_ACTION=quit \
-            NOTIFY=all
+# Install software using Installomator
+cmdOutput="$(${destFile} valuesfromarguments LOGO=$LOGO \
+    name=CraftManager \
+    type=zip \
+    downloadURL=$downloadURL \
+    appNewVersion=$appNewVersion \
+    expectedTeamID=VRXQSNCL5W \
+    BLOCKING_PROCESS_ACTION=prompt_user \
+    LOGGING=REQ \
+    NOTIFY=all || true)"
 
-# ${destFile} ${what} BLOCKING_PROCESS_ACTION=ignore NOTIFY=silent
-if [ $? != 0 ]; then
-# This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
-    echo "Error installing ${what}. Exit code $?"
-    caffexit $?
+# Check result
+exitStatus="$( echo "${cmdOutput}" | grep --binary-files=text -i "exit" | tail -1 | sed -E 's/.*exit code ([0-9]).*/\1/g' || true )"
+if [[ ${exitStatus} -eq 0 ]] ; then
+    echo -e "${what} succesfully installed.\n"
+else
+    echo -e "Error installing ${what}. Exit code ${exitStatus}\n"
+    #printlog "$cmdOutput"
+    errorOutput="$( echo "${cmdOutput}" | grep --binary-files=text -i "error" || true )"
+    echo "$errorOutput"
+   	caffexit $exitStatus
 fi
 
 echo "[$(DATE)][LOG-END]"