michael/MacAdmin
1
0
Fork 0
mirror of https://github.com/MLBZ521/MacAdmin.git synced 2026-02-03 14:03:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

v1.4.1 = Minor Code Improvements

Browse Source 
+ Minor Code Improvements
This commit is contained in:
Zack T
2018-08-06 22:54:36 -07:00
parent 3e493471c5
commit e5cfed66c9
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Jamf Pro/Extension Attributes/jamf_ea_LatestOSSupported.sh
View File

@@ -3,7 +3,7 @@
###################################################################################################
# Script Name: jamf_ea_LatestOSSupported.sh
# By: Zack Thompson / Created: 9/26/2017
# Version: 1.4 / Updated: 7/19/2018 / By: ZT
# Version: 1.4.1 / Updated: 8/6/2017 / By: ZT
#
# Description: A Jamf Extension Attribute to check the latest compatible version of macOS.
#
@@ -31,15 +31,15 @@
modelCheck() {
if [[ $modelMajorVersion -ge $1 && $(/usr/bin/bc <<< "${osVersion} >= 8") -eq 1 ]]; then
/bin/echo "<result>Mojave</result>"
echo "<result>Mojave</result>"
elif [[ $modelMajorVersion -ge $2 && $(/usr/bin/bc <<< "${osVersion} >= 8") -eq 1 ]]; then
/bin/echo "<result>High Sierra</result>"
echo "<result>High Sierra</result>"
elif [[ $modelMajorVersion -ge $2 && $(/usr/bin/bc <<< "${osVersion} >= 7.5") -eq 1 ]]; then
/bin/echo "<result>Sierra</result>" # (Current OS Limitation, 10.13 Compatible)
echo "<result>Sierra</result>" # (Current OS Limitation, 10.13 Compatible)
elif [[ $modelMajorVersion -ge $3 && $(/usr/bin/bc <<< "${osVersion} >= 6.8") -eq 1 ]]; then
/bin/echo "<result>El Capitan</result>"
echo "<result>El Capitan</result>"
else
/bin/echo "<result>Model or Current OS Not Supported</result>"
echo "<result>Model or Current OS Not Supported</result>"
fi
}
@@ -47,14 +47,14 @@ modelCheck() {
# Get machine info
# Get the OS Version
osVersion=$(sw_vers -productVersion | /usr/bin/awk -F '.' '{print $2"."$3}')
osVersion=$(/usr/bin/sw_vers -productVersion | /usr/bin/awk -F '.' '{print $2"."$3}')
# Get the Model Type and Major Version
modelType=$(/usr/sbin/sysctl -n hw.model | /usr/bin/sed 's/[^a-zA-Z]//g')
modelMajorVersion=$(/usr/sbin/sysctl -n hw.model | /usr/bin/sed 's/[^0-9,]//g' | /usr/bin/awk -F, '{print $1}')
# Get RAM
systemRAM=$(/usr/sbin/sysctl -n hw.memsize)
# Get free space on the boot disk
systemFreeSpace=$(diskutil info / | /usr/bin/awk -F '[()]' '/Free Space|Available Space/ {print $2}' | /usr/bin/cut -d " " -f1)
systemFreeSpace=$(/usr/sbin/diskutil info / | /usr/bin/awk -F '[()]' '/Free Space|Available Space/ {print $2}' | /usr/bin/cut -d " " -f1)
##################################################
# Check for compatibility...
@@ -92,12 +92,12 @@ if [[ $systemRAM -ge $requiredRAM && $systemFreeSpace -ge $requiredFreeSpace ]];
modelCheck 1 1
;;
* )
/bin/echo "<result>Unknown Model</result>"
echo "<result>Unknown Model</result>"
;;
esac
else
/bin/echo "<result>Insufficient Resources</result>"
echo "<result>Insufficient Resources</result>"
fi
exit 0