From ecd0ebf441eeee65dcfa5809b7302b1839345e0e Mon Sep 17 00:00:00 2001
From: Michael <30936296+mtan93@users.noreply.github.com>
Date: Wed, 21 Sep 2022 16:49:22 +0000
Subject: [PATCH] updating variable for MDMAPPLABEL

---
 Helpers/install-app-loop.sh      | 18 ++++++++----------
 Helpers/show-dialog-depnotify.sh |  8 +-------
 2 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/Helpers/install-app-loop.sh b/Helpers/install-app-loop.sh
index 104fefc..34f3966 100644
--- a/Helpers/install-app-loop.sh
+++ b/Helpers/install-app-loop.sh
@@ -13,15 +13,13 @@ chmod 777 /var/tmp/depnotify.log
 LOGO="mosyleb" # or "mosylem"
 ######################################################################
 
-whatList=$MDMAPPLABEL
-echo
-echo THE BELOW ERROR IS NORMAL
-while read line >> /dev/null
-do
-  echo "$line"
-done < "${1:-/dev/stdin}"
-echo PLEASE IGNORE ABOVE ERROR
-echo
+whatList="$MDMAPPLABEL"
+
+# CHECKS IF INSTALLOMATOR IS INSTALLED AND INSTALLS IF NOT
+if [ ! -e "/usr/local/Installomator/Installomator.sh" ]; then
+	curl -s https://raw.githubusercontent.com/PurpleComputing/mdmscripts/main/Installomator.sh | bash
+fi
+
 # No sleeping
 /usr/bin/caffeinate -d -i -m -u &
 caffeinatepid=$!
@@ -41,7 +39,7 @@ prplappcount=`expr $prplappno + 4`
 prpltrueappcount=`expr $prplappno + 1`
 echo "Command: DeterminateManual: $prplappcount" >> /var/tmp/depnotify.log
 echo "-- INSTALLING $prpltrueappcount APPS --"
-echo Installs started for "$@"
+echo Installs started for "$MDMAPPLABEL"
 # Verify that Installomator has been installed
 destFile="/usr/local/Installomator/Installomator.sh"
 if [ ! -e "${destFile}" ]; then
diff --git a/Helpers/show-dialog-depnotify.sh b/Helpers/show-dialog-depnotify.sh
index b265e09..51f39b0 100644
--- a/Helpers/show-dialog-depnotify.sh
+++ b/Helpers/show-dialog-depnotify.sh
@@ -3,12 +3,6 @@
 
 # SERVICE SCRIPT CALLED BY OTHER SCRIPTS
 
-#
-APPNAME=$MDMAPPNAME
-INSTALLAPP=googleearth
-ILOGO=mosyleb
-LOGLOCAL=/Library/Logs/com.purplecomputing.mdm/
-
 # UPDATE PURPLE HELPERS
 curl -s -L https://prpl.it/helperscript | bash
 
@@ -17,7 +11,7 @@ curl -s -L https://prpl.it/helperscript | bash
 ##-------------------------------##
 
 # SET APP TITLE TO APPNAME
-echo "$APPNAME" >> /Library/Caches/com.purplecomputing.mdm/Apps/.appinstallname
+echo "$MDMAPPNAME" >> /Library/Caches/com.purplecomputing.mdm/Apps/.appinstallname
 
 # SET DEP NOTIFY FOR REINSTALL
 curl -s -L https://prpl.it/brandDEPinstall | bash