diff --git a/enrollment-cleanup.sh b/enrollment-cleanup.sh index a80340b..6225076 100644 --- a/enrollment-cleanup.sh +++ b/enrollment-cleanup.sh @@ -13,23 +13,26 @@ # # HISTORY # -# Version: 1.1 +# Version: 1.3 # # - v.1.0 Martyn Watts, 05.07.2021 - Initial Build # - v.1.1 Martyn Watts, 07.07.2021 - Added the process to kill off safari to ensure that it doesn't interfere with Acrobat install # - v.1.2 Martyn Watts, 08.07.2021 - Added DEPNotify Updates -# +# - v.1.3 Martyn Watts, 29.09.2021 - Added scriptver variable and sent to log # #################################################################################################### deplog="/var/tmp/depnotify.log" +logfile="/Library/Logs/EnrollmentProcessCleanUp.log" +scriptver='1.3' +/bin/echo "Script Version: ${scriptver}" >> ${logfile} /bin/echo "Status: Cleaning up the Enrollment Process" >> ${deplog} +/bin/echo "Status: Cleaning up the Enrollment Process" >> ${logfile} sleep 2 loggedInUser=$( echo "show State:/Users/ConsoleUser" | /usr/sbin/scutil | /usr/bin/awk '/Name :/ && ! /loginwindow/ { print $3 }' ) fileLocation="/Users/${loggedInUser}/Downloads/enrollmentProfile.mobileconfig" -logfile="/Library/Logs/EnrollmentProcessCleanUp.log" /bin/echo "`date`: Forcing Safari to quit if open" >> ${logfile} /bin/echo "Status: Forcing Safari to quit if open" >> ${deplog} diff --git a/google-chrome.sh b/google-chrome.sh index 48c80f7..da4b505 100644 --- a/google-chrome.sh +++ b/google-chrome.sh @@ -19,6 +19,7 @@ # - 1.1-m Michael Tanner, 18.08.2021 Adapted for Mosyle # - 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 # #################################################################################################### # Script to download and install Google Chrome. @@ -32,14 +33,18 @@ appName='Google Chrome' forceQuit='Y' logfile="/Library/Logs/GoogleChromeInstallScript.log" deplog="/var/tmp/depnotify.log" +scriptver='1.4' + +echo "Script Version: ${scriptver}" >> ${logfile} +echo "Status: Installing ${appName}" >> ${deplog} +echo "Status: Installing ${appName}" >> ${logfile} + if [[ $@ == "openconsole" ]]; then open ${logfile} open ${deplog} fi -echo "Status: Installing ${appName}" >> ${deplog} - # To get just the latest version number from the version check URL /bin/echo "`date`: Downloading latest version." >> ${logfile} /bin/echo "Downloading latest version." diff --git a/microsoft-apps.sh b/microsoft-apps.sh index 099bb78..3fd551c 100644 --- a/microsoft-apps.sh +++ b/microsoft-apps.sh @@ -44,7 +44,11 @@ function install_software () { VERSION=$(echo "${LATEST_XML}" | xmllint --xpath '//latest/package[id="'${SOFTWARE_ID}'"]/cfbundleversion/text()' -) deplog="/var/tmp/depnotify.log" logfile="/tmp/OfficeInstallScript-${SOFTWARE_NAME}.log" - + scriptver="2.0" + + echo "Script version: ${scriptver}" >> ${logfile} + echo "Script version: ${scriptver}" >> ${deplog} + if [[ ${OPEN_CONSOLE} == "openconsole" ]]; then open ${logfile} open ${deplog}