From 64a91bff3608db4b1c2a30f4788129152fcc5369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Theilgaard?= <soren@theilgaard.dk>
Date: Thu, 20 Jan 2022 11:34:18 +0100
Subject: [PATCH] MDM script correction

I seems to have seen that `caffeinate` is not really stopped, so I added `pkill caffeinate`.
---
 MDM/App script.sh                 | 1 +
 MDM/App-loop script.sh            | 1 +
 MDM/Installomator update.sh       | 1 +
 MDM/MDMAddigy CustomSoftware.sh   | 1 +
 MDM/MDMMosyle install.sh          | 1 +
 MDM/Manual valuesfromarguments.sh | 1 +
 6 files changed, 6 insertions(+)

diff --git a/MDM/App script.sh b/MDM/App script.sh
index a23fd95..a33a43a 100755
--- a/MDM/App script.sh	
+++ b/MDM/App script.sh	
@@ -12,6 +12,7 @@ what="brave" # enter the software to install
 caffeinatepid=$!
 caffexit () {
     kill "$caffeinatepid"
+    pkill caffeinate
     exit $1
 }
 
diff --git a/MDM/App-loop script.sh b/MDM/App-loop script.sh
index f8b1025..17ce761 100755
--- a/MDM/App-loop script.sh	
+++ b/MDM/App-loop script.sh	
@@ -12,6 +12,7 @@ what="microsoftteams microsoftyammer firefox bravebrowser cyberduck vlc signal"
 caffeinatepid=$!
 caffexit () {
     kill "$caffeinatepid"
+    pkill caffeinate
     exit $1
 }
 
diff --git a/MDM/Installomator update.sh b/MDM/Installomator update.sh
index fbc8327..70fe71f 100755
--- a/MDM/Installomator update.sh	
+++ b/MDM/Installomator update.sh	
@@ -10,6 +10,7 @@ what="installomator" # enter the software to install
 caffeinatepid=$!
 caffexit () {
     kill "$caffeinatepid"
+    pkill caffeinate
     exit $1
 }
 
diff --git a/MDM/MDMAddigy CustomSoftware.sh b/MDM/MDMAddigy CustomSoftware.sh
index 9d21530..8feb85a 100755
--- a/MDM/MDMAddigy CustomSoftware.sh	
+++ b/MDM/MDMAddigy CustomSoftware.sh	
@@ -20,6 +20,7 @@ what="supportapp xink textmate microsoftedge wwdc keka vlc " # enter the softwar
 caffeinatepid=$!
 caffexit () {
     kill "$caffeinatepid"
+    pkill caffeinate
     exit $1
 }
 
diff --git a/MDM/MDMMosyle install.sh b/MDM/MDMMosyle install.sh
index becfc00..6c6f9ca 100644
--- a/MDM/MDMMosyle install.sh	
+++ b/MDM/MDMMosyle install.sh	
@@ -14,6 +14,7 @@ what="handbrake theunarchiver microsoftoffice365"
 caffeinatepid=$!
 caffexit () {
     kill "$caffeinatepid"
+    pkill caffeinate
     exit $1
 }
 
diff --git a/MDM/Manual valuesfromarguments.sh b/MDM/Manual valuesfromarguments.sh
index f435825..706f81f 100755
--- a/MDM/Manual valuesfromarguments.sh	
+++ b/MDM/Manual valuesfromarguments.sh	
@@ -9,6 +9,7 @@ what="valuesfromarguments" # enter the software to install
 caffeinatepid=$!
 caffexit () {
     kill "$caffeinatepid"
+    pkill caffeinate
     exit $1
 }