From b2ca40f575acda0b451e938555637feaefc7d40b Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Fri, 5 Nov 2021 22:18:51 +0000
Subject: [PATCH] added more cache directories

---
 Helpers/purple-helpers.sh |  3 +++
 MDM-Script-Pull.md        | 46 ++++++++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/Helpers/purple-helpers.sh b/Helpers/purple-helpers.sh
index 2c8b1ce..05323f4 100644
--- a/Helpers/purple-helpers.sh
+++ b/Helpers/purple-helpers.sh
@@ -8,6 +8,9 @@ curl -o /Library/Application\ Support/Purple/purple-icon.png https://raw.githubu
 curl -o /Library/Application\ Support/Purple/launch-dep.sh https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/launch-dep.sh
 curl -o /Library/Application\ Support/Purple/launch-dep-en.sh https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/launch-dep-en.sh
 mkdir -p /Library/Caches/com.purplecomputing.mdm/
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Scripts
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Apps
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Logs
 # Give full permissions
 chmod -R 777 /Library/Application\ Support/Purple/
 chmod -R 777 /Library/Caches/com.purplecomputing.mdm/
\ No newline at end of file
diff --git a/MDM-Script-Pull.md b/MDM-Script-Pull.md
index 42e50c9..41dd568 100644
--- a/MDM-Script-Pull.md
+++ b/MDM-Script-Pull.md
@@ -2,8 +2,6 @@
 ```
 ##  PURPLE GITHUB PULL TEMPLATE  ##
 ##-------------------------------##
-##        SET PERMISSIONS        ##
-chmod 777 -R /tmp
 ##-------------------------------##
 ##         SET VARIABLES         ##
 
@@ -17,48 +15,56 @@ APPNAME='APPNAME'
 ##-------------------------------##
 
 # CLEAN UP PREVIOUS FILES
-rm -rf /tmp/$SCRIPTNAME
-rm -rf /tmp/brandDEPinstall.sh
+rm -rf /Library/Caches/com.purplecomputing.mdm/Scripts/$SCRIPTNAME
+rm -rf /Library/Caches/com.purplecomputing.mdm/Scripts/brandDEPinstall.sh
+rm -rf /Library/Caches/com.purplecomputing.mdm/Scripts/.appinstallname
 
 # REMOVE APPS AND FILES
-killall $appname
-rm -rf /Applications/$appname.app
+killall $APPNAME
+rm -rf /Applications/$APPNAME.app
+
+# UPDATE PURPLE HELPERS
+curl -o /Library/Caches/com.purplecomputing.mdm/Scripts/purple-helpers.sh https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/purple-helpers.sh
+chmod +x /Library/Caches/com.purplecomputing.mdm/Scripts/purple-helpers.sh
+/Library/Caches/com.purplecomputing.mdm/Scripts/purple-helpers.sh >> /Library/Caches/com.purplecomputing.mdm/Logs/purple-helpers.log
+sleep 2s
+rm -rf purple-helpers.sh
 
 ##-------------------------------##
 ##       DEPNOTIFY WINDOW        ##
 ##-------------------------------##
 
 # SET APP TITLE TO APPNAME
-echo $appname >> /tmp/.appinstallname
+echo $APPNAME >> /Library/Caches/com.purplecomputing.mdm/Apps/.appinstallname
 
 # SET DEP NOTIFY FOR REINSTALL
-curl -o /tmp/brandDEPinstall.sh https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/brandDEPinstall.sh
-chmod +x /tmp/brandDEPinstall.sh
-/tmp/brandDEPinstall.sh
+curl -o /Library/Caches/com.purplecomputing.mdm/Scripts/brandDEPinstall.sh https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Helpers/brandDEPinstall.sh
+chmod +x /Library/Caches/com.purplecomputing.mdm/Scripts/brandDEPinstall.sh
+/Library/Caches/com.purplecomputing.mdm/Scripts/brandDEPinstall.sh >> /Library/Caches/com.purplecomputing.mdm/Logs/brandDEPinstall.log
 sleep 2s
-chmod 777 /var/tmp/depnotify.log
+chmod 777 /var/private/var/tmp/depnotify.log
+rm -rf /Library/Caches/com.purplecomputing.mdm/Scripts/brandDEPinstall.sh
 
 # START DEPNOTIFY
-sudo -u %LastConsoleUser% /Library/Application\ Support/Purple/launch-dep.sh
+/Library/Application\ Support/Purple/launch-dep.sh
 
 ##-------------------------------##
 ##         START SCRIPT          ##
 ##-------------------------------##
 
 # DOWNLOAD LATEST FILE
-curl -o /tmp/$SCRIPTNAME https://raw.githubusercontent.com/PurpleComputing/$REPO/$BRANCH/$SCRIPTNAME
+curl -o /Library/Caches/com.purplecomputing.mdm/Scripts/$SCRIPTNAME https://raw.githubusercontent.com/PurpleComputing/$REPO/$BRANCH/$SCRIPTNAME
 # GIVE EXECUTE PERMISSIONS
-sudo -u $(stat -f "%Su" /dev/console) /bin/sh <<'END'
-chmod +x /tmp/$SCRIPTNAME
+chmod +x /Library/Caches/com.purplecomputing.mdm/Scripts/$SCRIPTNAME
 # RUN AS CURRENT USER
-/tmp/$SCRIPTNAME >> /tmp/$SCRIPTNAME.log
+sudo /Library/Caches/com.purplecomputing.mdm/Scripts/$SCRIPTNAME >> /Library/Caches/com.purplecomputing.mdm/Logs/$SCRIPTNAME.log
 
 ##-------------------------------##
 ##       DEPNOTIFY CLOSE         ##
 ##-------------------------------##
 
 # CLOSE DEP NOTIFY WINDOW
-echo Status: $appname Install Complete >> /var/tmp/depnotify.log
+echo Status: $APPNAME Install Complete >> /var/private/var/tmp/depnotify.log
 sleep 10s
 killall DEPNotify
 
@@ -66,9 +72,9 @@ killall DEPNotify
 ##      POSTFLIGHT SCRIPT        ##
 ##-------------------------------##
 
-rm -rf /tmp/$scriptfilename
-rm -rf /tmp/.appinstallname
-rm -rf /tmp/brandDEPinstall.sh
+rm -rf /Library/Caches/com.purplecomputing.mdm/Scripts/$SCRIPTNAME
+rm -rf /Library/Caches/com.purplecomputing.mdm/Apps/.appinstallname
+
 
 # END SCRIPT WITH SUCCESS
 exit 0