From 9c9abe0e975dd0fe8b93900a10c4806735f53103 Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Fri, 5 Nov 2021 21:28:40 +0000
Subject: [PATCH 1/8] 0511

---
 Helpers/purple-helpers.sh | 11 ++++++++
 MDM-Script-Pull.md        | 59 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 67 insertions(+), 3 deletions(-)
 create mode 100644 Helpers/purple-helpers.sh

diff --git a/Helpers/purple-helpers.sh b/Helpers/purple-helpers.sh
new file mode 100644
index 0000000..52bd472
--- /dev/null
+++ b/Helpers/purple-helpers.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# Remove Old Files
+rm -rf /Library/Application\ Support/Purple/*
+# Pull latest files
+curl -o /Library/Application\ Support/Purple/logo.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/logo.png
+curl -o /Library/Application\ Support/Purple/logo-dark.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/logo-dark.png
+curl -o /Library/Application\ Support/Purple/purple-icon.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/purple-icon.png
+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
+# Give full permissions
+chmod -R 777 /Library/Application\ Support/Purple/
\ No newline at end of file
diff --git a/MDM-Script-Pull.md b/MDM-Script-Pull.md
index 6dcef8c..42e50c9 100644
--- a/MDM-Script-Pull.md
+++ b/MDM-Script-Pull.md
@@ -6,14 +6,45 @@
 chmod 777 -R /tmp
 ##-------------------------------##
 ##         SET VARIABLES         ##
+
 SCRIPTNAME=[[fix-outlook-spotlight.sh]]
 REPO=[[troubleshooting]]
 BRANCH=[[main]]
+APPNAME='APPNAME'
+
+##-------------------------------##
+##       PREFLIGHT SCRIPT        ##
+##-------------------------------##
+
+# CLEAN UP PREVIOUS FILES
+rm -rf /tmp/$SCRIPTNAME
+rm -rf /tmp/brandDEPinstall.sh
+
+# REMOVE APPS AND FILES
+killall $appname
+rm -rf /Applications/$appname.app
+
+##-------------------------------##
+##       DEPNOTIFY WINDOW        ##
+##-------------------------------##
+
+# SET APP TITLE TO APPNAME
+echo $appname >> /tmp/.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
+sleep 2s
+chmod 777 /var/tmp/depnotify.log
+
+# START DEPNOTIFY
+sudo -u %LastConsoleUser% /Library/Application\ Support/Purple/launch-dep.sh
+
 ##-------------------------------##
 ##         START SCRIPT          ##
 ##-------------------------------##
-# CLEAN UP PREVIOUS FILE
-rm -rf /tmp/$SCRIPTNAME
+
 # DOWNLOAD LATEST FILE
 curl -o /tmp/$SCRIPTNAME https://raw.githubusercontent.com/PurpleComputing/$REPO/$BRANCH/$SCRIPTNAME
 # GIVE EXECUTE PERMISSIONS
@@ -21,4 +52,26 @@ sudo -u $(stat -f "%Su" /dev/console) /bin/sh <<'END'
 chmod +x /tmp/$SCRIPTNAME
 # RUN AS CURRENT USER
 /tmp/$SCRIPTNAME >> /tmp/$SCRIPTNAME.log
-```
\ No newline at end of file
+
+##-------------------------------##
+##       DEPNOTIFY CLOSE         ##
+##-------------------------------##
+
+# CLOSE DEP NOTIFY WINDOW
+echo Status: $appname Install Complete >> /var/tmp/depnotify.log
+sleep 10s
+killall DEPNotify
+
+##-------------------------------##
+##      POSTFLIGHT SCRIPT        ##
+##-------------------------------##
+
+rm -rf /tmp/$scriptfilename
+rm -rf /tmp/.appinstallname
+rm -rf /tmp/brandDEPinstall.sh
+
+# END SCRIPT WITH SUCCESS
+exit 0
+
+```
+

From 261786b9f71d46b81f450e9839cbceaec7f48541 Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Fri, 5 Nov 2021 21:49:24 +0000
Subject: [PATCH 2/8] add purple tmp folder

---
 Helpers/purple-helpers.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Helpers/purple-helpers.sh b/Helpers/purple-helpers.sh
index 52bd472..80d7eee 100644
--- a/Helpers/purple-helpers.sh
+++ b/Helpers/purple-helpers.sh
@@ -7,5 +7,7 @@ curl -o /Library/Application\ Support/Purple/logo-dark.png https://raw.githubuse
 curl -o /Library/Application\ Support/Purple/purple-icon.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/purple-icon.png
 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 /private/var/tmp/purple/
 # Give full permissions
-chmod -R 777 /Library/Application\ Support/Purple/
\ No newline at end of file
+chmod -R 777 /Library/Application\ Support/Purple/
+chmod -R 777 /private/var/tmp/purple/
\ No newline at end of file

From b91670cc4d2eed6ec75c980cd2c87e96a4447f8e Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Fri, 5 Nov 2021 21:59:25 +0000
Subject: [PATCH 3/8] Update purple-helpers.sh

---
 Helpers/purple-helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Helpers/purple-helpers.sh b/Helpers/purple-helpers.sh
index 80d7eee..8249f08 100644
--- a/Helpers/purple-helpers.sh
+++ b/Helpers/purple-helpers.sh
@@ -7,7 +7,7 @@ curl -o /Library/Application\ Support/Purple/logo-dark.png https://raw.githubuse
 curl -o /Library/Application\ Support/Purple/purple-icon.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/purple-icon.png
 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 /private/var/tmp/purple/
+mkdir -p /Library/Caches/com.purplecomputing.mdm/
 # Give full permissions
 chmod -R 777 /Library/Application\ Support/Purple/
 chmod -R 777 /private/var/tmp/purple/
\ No newline at end of file

From 57cf35c951890838c1a02e9a2d0ef5f6d39b4164 Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Fri, 5 Nov 2021 22:00:00 +0000
Subject: [PATCH 4/8] Update purple-helpers.sh

---
 Helpers/purple-helpers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Helpers/purple-helpers.sh b/Helpers/purple-helpers.sh
index 8249f08..2c8b1ce 100644
--- a/Helpers/purple-helpers.sh
+++ b/Helpers/purple-helpers.sh
@@ -10,4 +10,4 @@ curl -o /Library/Application\ Support/Purple/launch-dep-en.sh https://raw.github
 mkdir -p /Library/Caches/com.purplecomputing.mdm/
 # Give full permissions
 chmod -R 777 /Library/Application\ Support/Purple/
-chmod -R 777 /private/var/tmp/purple/
\ No newline at end of file
+chmod -R 777 /Library/Caches/com.purplecomputing.mdm/
\ No newline at end of file

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 5/8] 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

From a218b7e4b50b45df33ea876f120c348058c4aed5 Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Sat, 6 Nov 2021 21:30:26 +0000
Subject: [PATCH 6/8] fix paths

---
 Helpers/purple-helpers.sh | 12 ++++++++++--
 MDM-Script-Pull.md        |  4 ++--
 google-chrome.sh          | 14 ++++++++++----
 zerotier.sh               | 21 ++++++++++++++-------
 4 files changed, 36 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 MDM-Script-Pull.md
 mode change 100644 => 100755 google-chrome.sh
 mode change 100644 => 100755 zerotier.sh

diff --git a/Helpers/purple-helpers.sh b/Helpers/purple-helpers.sh
index 05323f4..025d03e 100644
--- a/Helpers/purple-helpers.sh
+++ b/Helpers/purple-helpers.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
+
 # Remove Old Files
+mkdir -p /Library/Application\ Support/Purple/
 rm -rf /Library/Application\ Support/Purple/*
+rm -rf /Library/Caches/com.purplecomputing.mdm/Logs/
+
 # Pull latest files
 curl -o /Library/Application\ Support/Purple/logo.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/logo.png
 curl -o /Library/Application\ Support/Purple/logo-dark.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/logo-dark.png
@@ -10,7 +14,11 @@ curl -o /Library/Application\ Support/Purple/launch-dep-en.sh https://raw.github
 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
+mkdir -p /Library/Logs/com.purplecomputing.mdm/
+ln -s /Library/Logs/com.purplecomputing.mdm/ /tmp/purple-logs/
+ln -s /Library/Logs/com.purplecomputing.mdm/ /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
+chmod -R 777 /Library/Caches/com.purplecomputing.mdm/
+chmod 777 /var/tmp/depnotify.log
\ No newline at end of file
diff --git a/MDM-Script-Pull.md b/MDM-Script-Pull.md
old mode 100644
new mode 100755
index 41dd568..599e142
--- a/MDM-Script-Pull.md
+++ b/MDM-Script-Pull.md
@@ -42,7 +42,7 @@ curl -o /Library/Caches/com.purplecomputing.mdm/Scripts/brandDEPinstall.sh https
 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/private/var/tmp/depnotify.log
+chmod 777 /var/tmp/depnotify.log
 rm -rf /Library/Caches/com.purplecomputing.mdm/Scripts/brandDEPinstall.sh
 
 # START DEPNOTIFY
@@ -64,7 +64,7 @@ sudo /Library/Caches/com.purplecomputing.mdm/Scripts/$SCRIPTNAME >> /Library/Cac
 ##-------------------------------##
 
 # CLOSE DEP NOTIFY WINDOW
-echo Status: $APPNAME Install Complete >> /var/private/var/tmp/depnotify.log
+echo Status: $APPNAME Install Complete >> /var/tmp/depnotify.log
 sleep 10s
 killall DEPNotify
 
diff --git a/google-chrome.sh b/google-chrome.sh
old mode 100644
new mode 100755
index da4b505..ccaef48
--- a/google-chrome.sh
+++ b/google-chrome.sh
@@ -20,6 +20,7 @@
 #   - 1.2 Martyn Watts, 24.09.2021 Added Check to see if dockutil is installed to make the script more resilient
 #   - 1.3 Martyn Watts, 28.09.2021 Added Open Console Parameter to use with TeamViewer
 #   - 1.4 Martyn Watts, 29.09.2021 Added scriptver variable and corrected log opening
+#   - 1.5 Michael Tanner, 06.11.2021 
 #
 ####################################################################################################
 # Script to download and install Google Chrome.
@@ -33,7 +34,12 @@ appName='Google Chrome'
 forceQuit='Y'
 logfile="/Library/Logs/GoogleChromeInstallScript.log"
 deplog="/var/tmp/depnotify.log"
-scriptver='1.4'
+scriptver='1.5'
+
+#Making Purple Cache directories for in the event that the helper script hasn't been run
+mkdir -p /Library/Caches/com.purplecomputing.mdm/
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Logs/
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Apps/
 
 echo "Script Version: ${scriptver}" >> ${logfile}
 echo "Status: Installing ${appName}" >> ${deplog}
@@ -48,13 +54,13 @@ fi
 #  To get just the latest version number from the version check URL
 /bin/echo "`date`: Downloading latest version." >> ${logfile}
 /bin/echo "Downloading latest version."
-/usr/bin/curl -o "/tmp/${dnldfile}" ${url}
+/usr/bin/curl -o "/Library/Caches/com.purplecomputing.mdm/Apps/${dnldfile}" ${url}
 /bin/echo "`date`: Expanding package." >> ${logfile}
 /bin/echo "Expanding package."
-pkgutil --expand "/tmp/${dnldfile}" /tmp/pkg
+pkgutil --expand "/Library/Caches/com.purplecomputing.mdm/Apps/${dnldfile}" /Library/Caches/com.purplecomputing.mdm/Apps/pkg
 /bin/echo "`date`: Storing latest version data." >> ${logfile}
 /bin/echo "Storing latest version data."
-latestver=$(cat /tmp/pkg/Distribution | grep 'CFBundleShortVersionString' | cut -f2 -d '"')
+latestver=$(cat /Library/Caches/com.purplecomputing.mdm/Apps/pkg/Distribution | grep 'CFBundleShortVersionString' | cut -f2 -d '"')
 /bin/echo "`date`: Removing expanded package" >> ${logfile}
 /bin/echo "Removing expanded package."
 /bin/rm -rf /tmp/pkg
diff --git a/zerotier.sh b/zerotier.sh
old mode 100644
new mode 100755
index bfb812b..2abe6cd
--- a/zerotier.sh
+++ b/zerotier.sh
@@ -13,34 +13,41 @@
 #
 # HISTORY
 #
-#   Version: 1.2
+#   Version: 1.3
 #
 #   - 1.0 Martyn Watts, 25.06.2021 Initial Script Template Build
 #   - 1.1 Michael Tanner, 28.09.2021 Implement ZeroTier Install Script
 #   - 1.2 Martyn Watts, 29.09.2021 Added logging information
+#   - 1.3 Michael Tanner, 06.11.2021 fixing /tmp folder usage for Monterey
 #
 #########################################################################
 # Script to install ZeroTier and to join the organisations ZT Network.
 #
-scriptver='1.2'
-logfile="/Library/Logs/ZeroTierInstallScript.log"
+scriptver='1.3'
+logfile="/Library/Caches/com.purplecomputing.mdm/Logs/ZeroTierInstallScript.log"
 appName="ZeroTier"
+deplog="/var/tmp/depnotify.log"
+
+#Making Purple Cache directories for in the event that the helper script hasn't been run
+mkdir -p /Library/Caches/com.purplecomputing.mdm/
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Logs/
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Apps/
 
 echo "Status: Installing ${appName} using script version ${scriptver}" >> ${deplog}
 echo "Status: Installing ${appName} using script version ${scriptver}" >> ${logfile}
 
 echo "Status: Downloading ZeroTier" >> ${logfile}
 echo "Status: Downloading ZeroTier" >> ${deplog}
-curl -o /tmp/apps/ZT.pkg https://download.zerotier.com/dist/ZeroTier%20One.pkg
+curl -o /Library/Caches/com.purplecomputing.mdm/Apps/ZT.pkg https://download.zerotier.com/dist/ZeroTier%20One.pkg
 
 echo "Status: Running the installer" >> ${logfile}
 echo "Status: Running the installer" >> ${deplog}
-installer -pkg /tmp/apps/ZT.pkg -target /
+installer -pkg /Library/Caches/com.purplecomputing.mdm/Apps/ZT.pkg -target /
 
 echo "Status: Cleaning up after the installer" >> ${logfile}
 echo "Status: Cleaning up after the installer" >> ${deplog}
-rm -rf /tmp/apps/ZT.pkg
-sleep 2s
+rm -rf /Library/Caches/com.purplecomputing.mdm/Apps/ZT.pkg
+sleep 2
 
 echo "Status: Joining ZeroTier to network ${@}" >> ${logfile}
 echo "Status: Joining ZeroTier to network ${@}" >> ${deplog}

From 5028a65c89ba8991ee952e719a2511c175695943 Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Sat, 6 Nov 2021 21:45:19 +0000
Subject: [PATCH 7/8] updating log paths

---
 Helpers/purple-helpers.sh | 12 +++++++++++-
 zerotier.sh               |  4 ++--
 2 files changed, 13 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 Helpers/purple-helpers.sh

diff --git a/Helpers/purple-helpers.sh b/Helpers/purple-helpers.sh
old mode 100644
new mode 100755
index 025d03e..e5be658
--- a/Helpers/purple-helpers.sh
+++ b/Helpers/purple-helpers.sh
@@ -1,24 +1,34 @@
 #!/bin/bash
 
 # Remove Old Files
+echo Making App Support Directories
 mkdir -p /Library/Application\ Support/Purple/
+echo Cleaning App Support Cache and Log Directories
 rm -rf /Library/Application\ Support/Purple/*
-rm -rf /Library/Caches/com.purplecomputing.mdm/Logs/
 
 # Pull latest files
+echo Downloading Image Files
 curl -o /Library/Application\ Support/Purple/logo.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/logo.png
 curl -o /Library/Application\ Support/Purple/logo-dark.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/logo-dark.png
 curl -o /Library/Application\ Support/Purple/purple-icon.png https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/PurpleLogos/purple-icon.png
+echo Downloading Scripts
 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
+echo Making Cache and Log Directories
 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/Logs/com.purplecomputing.mdm/
+mkdir -p /tmp/purple-logs/
+mkdir -p /Library/Caches/com.purplecomputing.mdm/Logs/
+echo Linking Log Folders
 ln -s /Library/Logs/com.purplecomputing.mdm/ /tmp/purple-logs/
 ln -s /Library/Logs/com.purplecomputing.mdm/ /Library/Caches/com.purplecomputing.mdm/Logs/
 
+touch /var/tmp/depnotify.log
+
 # Give full permissions
 chmod -R 777 /Library/Application\ Support/Purple/
 chmod -R 777 /Library/Caches/com.purplecomputing.mdm/
+chmod -R 777 /Library/Logs/com.purplecomputing.mdm/
 chmod 777 /var/tmp/depnotify.log
\ No newline at end of file
diff --git a/zerotier.sh b/zerotier.sh
index 2abe6cd..f3b5c92 100755
--- a/zerotier.sh
+++ b/zerotier.sh
@@ -24,13 +24,13 @@
 # Script to install ZeroTier and to join the organisations ZT Network.
 #
 scriptver='1.3'
-logfile="/Library/Caches/com.purplecomputing.mdm/Logs/ZeroTierInstallScript.log"
+logfile="/Library/Logs/com.purplecomputing.mdm/ZeroTierInstallScript.log"
 appName="ZeroTier"
 deplog="/var/tmp/depnotify.log"
 
 #Making Purple Cache directories for in the event that the helper script hasn't been run
 mkdir -p /Library/Caches/com.purplecomputing.mdm/
-mkdir -p /Library/Caches/com.purplecomputing.mdm/Logs/
+mkdir -p /Library/Logs/com.purplecomputing.mdm/
 mkdir -p /Library/Caches/com.purplecomputing.mdm/Apps/
 
 echo "Status: Installing ${appName} using script version ${scriptver}" >> ${deplog}

From bb95325cd8808dc6a5dd2d967dbd6cb2c5ddd08a Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Thu, 2 Dec 2021 14:22:17 +0000
Subject: [PATCH 8/8] Update google-chrome.sh

---
 google-chrome.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/google-chrome.sh b/google-chrome.sh
index ccaef48..c935e64 100755
--- a/google-chrome.sh
+++ b/google-chrome.sh
@@ -63,7 +63,7 @@ pkgutil --expand "/Library/Caches/com.purplecomputing.mdm/Apps/${dnldfile}" /Lib
 latestver=$(cat /Library/Caches/com.purplecomputing.mdm/Apps/pkg/Distribution | grep 'CFBundleShortVersionString' | cut -f2 -d '"')
 /bin/echo "`date`: Removing expanded package" >> ${logfile}
 /bin/echo "Removing expanded package."
-/bin/rm -rf /tmp/pkg
+/bin/rm -rf /Library/Caches/com.purplecomputing.mdm/Apps/pkg
 
 
 # Get the version number of the currently-installed App, if any.
@@ -95,7 +95,7 @@ latestver=$(cat /Library/Caches/com.purplecomputing.mdm/Apps/pkg/Distribution |
         	if [[ "${forceQuit}" = "Y" ]]; then
         		killall ${appName}
         	fi
-		cd /tmp
+		cd /Library/Caches/com.purplecomputing.mdm/Apps/
        	/usr/sbin/installer -pkg ${dnldfile} -target /
 
         #double check to see if the new version got updated
@@ -131,6 +131,6 @@ latestver=$(cat /Library/Caches/com.purplecomputing.mdm/Apps/pkg/Distribution |
         /bin/sleep 5
         /bin/echo "`date`: Deleting the downloaded file." >> ${logfile}
         /bin/echo "Deleting the downloaded file."
-        /bin/rm /tmp/${dnldfile}
+        /bin/rm /Library/Caches/com.purplecomputing.mdm/Apps/${dnldfile}
   echo "Command: DeterminateManualStep: 1" >> ${deplog}