Merge pull request #328 from Installomator/MDM-script-with-caffeine

MDM with caffeinate

CHANGELOG.md

@@ -3,6 +3,7 @@
 - Installomator now detects when an app is already installed, and will display notifications correctly the user based on if the app was updated or installed for the first time.
 - New variables for labels that should be installaed using CLI: `CLIInstaller` and `CLIArguments`. If the installer app is named differently than the installed app, then the variable `installerTool` should be use to name the app that should be located in the DMG or zip. See the label __adobecreativeclouddesktop__ to see it’s use.
 - `buildLabel.sh` has been improved to build GitHub software labels much easier. In essense if the URL contains github.com, then it will try to find if it's the latest version or if variable `archiveName` is needed for finding the software. Also improved messaging throughout the script, as well as handling a situation where a pkg does not include a “DIstribution” file, but a “PackageInfo”.
+- MDM script extended with `caffeinate` so Mac will not go to sleep during the time it takes installomator to run. Especially during setup, this can be handy.
 - Microsoft labels with `updateTool` variable, is updated to run `msupdate --list` before running the updateTool directly. Problems have been reported that the update would fail if the `--list` parameter for the command was not run first.
 
 ## v0.7

MDM/App script.sh

@@ -7,6 +7,13 @@ what="brave" # enter the software to install
 # Script will run this label.
 ###############################################
 
+# No sleeping
+/usr/bin/caffeinate -d -i -m -u &
+caffeinatepid=$!
+caffexit () {
+    kill "$caffeinatepid"
+    exit $1
+}
 
 # Verify that Installomator has been installed
 destFile="/usr/local/Installomator/Installomator.sh"
@@ -14,19 +21,19 @@ if [ ! -e "${destFile}" ]; then
     echo "Installomator not found here:"
     echo "${destFile}"
     echo "Exiting."
-    exit 99
+    caffexit 99
 fi
 
 ${destFile} ${what} LOGO=mosyleb BLOCKING_PROCESS_ACTION=tell_user #NOTIFY=all #INSTALL=force
 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 $?"
-    exit $?
+    caffexit $?
 fi
 
 echo "[$(DATE)][LOG-END]"
 
-exit 0
+caffexit 0
 
 # notify behavior
 # NOTIFY=success

MDM/App-loop script.sh

@@ -7,13 +7,24 @@ what="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal"
 # Script will loop through these labels.
 ######################################################################
 
+# No sleeping
+/usr/bin/caffeinate -d -i -m -u &
+caffeinatepid=$!
+caffexit () {
+    kill "$caffeinatepid"
+    exit $1
+}
+
+# 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
+    caffexit 99
 fi
 
 for item in $what; do
@@ -22,13 +33,15 @@ for item in $what; do
     if [ $? != 0 ]; then
     # This is currently not working in Mosyle, that will ignore script errors. Please request support for this from Mosyle!
         echo "[$(DATE)] Error installing ${item}. Exit code $?"
-        # exit $?
+        let errorCount++
     fi
 done
 
+echo
+echo "Errors: $errorCount"
 echo "[$(DATE)][LOG-END]"
 
-exit 0
+caffexit $errorCount
 
 # notify behavior
 # NOTIFY=success

MDM/Installomator update.sh

@@ -5,13 +5,21 @@
 
 what="installomator" # enter the software to install
 
+# No sleeping
+/usr/bin/caffeinate -d -i -m -u &
+caffeinatepid=$!
+caffexit () {
+    kill "$caffeinatepid"
+    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."
-    exit 99
+    caffexit 99
 fi
 
 ${destFile} valuesfromarguments\
@@ -28,9 +36,8 @@ ${destFile} valuesfromarguments\
 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 $?"
-    exit $?
+    caffexit $?
 fi
 
 echo "[$(DATE)][LOG-END]"
-
+caffexit 0
-exit 0

MDM/MDMAddigy CustomSoftware.sh

@@ -15,6 +15,14 @@ what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the softwar
 # Script will loop through these labels and exit with number of errors.
 ######################################################################
 
+# No sleeping
+/usr/bin/caffeinate -d -i -m -u &
+caffeinatepid=$!
+caffexit () {
+    kill "$caffeinatepid"
+    exit $1
+}
+
 # Count errors
 errorCount=0
 
@@ -24,7 +32,7 @@ if [ ! -e "${destFile}" ]; then
     echo "Installomator not found here:"
     echo "${destFile}"
     echo "Exiting."
-    exit 99
+    caffexit 99
 fi
 
 for item in $what; do
@@ -34,7 +42,6 @@ for item in $what; do
     # Error handling
         echo "[$(DATE)] Error installing ${item}. Exit code $?"
         let errorCount++
-        # exit $?
     fi
 done
 
@@ -42,7 +49,7 @@ echo
 echo "Errors: $errorCount"
 echo "[$(DATE)][LOG-END]"
 
-exit $errorCount
+caffexit $errorCount
 
 # Mark: Conditions
 # Install on success

MDM/MDMMosyle install.sh

@@ -7,7 +7,15 @@ what="handbrake theunarchiver microsoftoffice365"
 # Covered by Mosyle Catalog: "brave firefox googlechrome microsoftedge microsoftteams signal sublimetext vlc webex zoom" among others
 ######################################################################
 
-## Code here
+## Mark: Code here
+
+# No sleeping
+/usr/bin/caffeinate -d -i -m -u &
+caffeinatepid=$!
+caffexit () {
+    kill "$caffeinatepid"
+    exit $1
+}
 
 # Mark: Condition for Installomator installation
 
@@ -19,12 +27,12 @@ if [[ "$TARGET_VERSION" != "$INSTALLED_VERSION" ]]; then
     TMPDIR=$(mktemp -d )
     if ! cd "$TMPDIR"; then
         echo "error changing directory $TMPDIR"
-        exit 98
+        caffexit 98
     fi
     NAME=$TMPDIR/$(date +%s).pkg
     if ! curl -fsL "$URLDOWNLOAD" -o "$NAME"; then
         echo "error downloading $URLDOWNLOAD to $NAME."
-        exit 97
+        caffexit 97
     fi
     installer -pkg "$NAME" -target /
     rm -rf "$TMPDIR"
@@ -44,7 +52,7 @@ if [ ! -e "${destFile}" ]; then
     echo "Installomator not found here:"
     echo "${destFile}"
     echo "Exiting."
-    exit 99
+    caffexit 99
 fi
 
 for item in $what; do
@@ -54,7 +62,6 @@ for item in $what; do
     # Error handling
         echo "[$(DATE)] Error installing ${item}. Exit code $?"
         let errorCount++
-        # exit $?
     fi
 done
 
@@ -62,4 +69,4 @@ echo
 echo "Errors: $errorCount"
 echo "[$(DATE)][LOG-END]"
 
-exit $errorCount
+caffexit $errorCount

MDM/Manual valuesfromarguments.sh

@@ -4,13 +4,21 @@
 
 what="valuesfromarguments" # enter the software to install
 
+# No sleeping
+/usr/bin/caffeinate -d -i -m -u &
+caffeinatepid=$!
+caffexit () {
+    kill "$caffeinatepid"
+    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."
-    exit 99
+    caffexit 99
 fi
 
 ${destFile} valuesfromarguments \
@@ -26,9 +34,8 @@ ${destFile} valuesfromarguments \
 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 $?"
-    exit $?
+    caffexit $?
 fi
 
 echo "[$(DATE)][LOG-END]"
-
+caffexit 0
-exit 0