tyler.durden
/
lynis
mirror of https://github.com/CISOfy/lynis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improvements for macOS

This commit is contained in:
Michael Boelen 2016-10-15 10:43:45 +02:00
parent 32711e4155
commit 7dd3c27b97
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/osdetection
View File

@ -42,11 +42,19 @@
OS="MacOS" OS="MacOS"
if [ -x /usr/bin/sw_vers ]; then if [ -x /usr/bin/sw_vers ]; then
OS_NAME=$(/usr/bin/sw_vers -productName) OS_NAME=$(/usr/bin/sw_vers -productName)
if [ "${OS_NAME}" = "Mac OS X" ]; then OS_NAME="macOS"; fi
OS_VERSION=$(/usr/bin/sw_vers -productVersion) OS_VERSION=$(/usr/bin/sw_vers -productVersion)
case ${OS_VERSION} in
10.9) OS_VERSION="Mavericks" ;;
10.10) OS_VERSION="Yosemite" ;;
10.11) OS_VERSION="El Capitan" ;;
10.12) OS_VERSION="Sierra" ;;
*) echo "Unknown macOS version. Do you know what version it is? Share at ${PROGRAM_SOURCE}" ;;
esac
OS_FULLNAME="${OS_NAME} ${OS_VERSION}" OS_FULLNAME="${OS_NAME} ${OS_VERSION}"
else else
# Fall back to a fairly safe name # Fall back to a fairly safe name
OS_NAME="Mac OS X" OS_NAME="macOS"
OS_FULLNAME=$(uname -s -r) OS_FULLNAME=$(uname -s -r)
OS_VERSION=$(uname -r) OS_VERSION=$(uname -r)
fi fi
@ -400,7 +408,7 @@
case ${OS} in case ${OS} in
"AIX") ECHOCMD="echo" ;; "AIX") ECHOCMD="echo" ;;
"DragonFly"|"FreeBSD"|"NetBSD") ECHOCMD="echo -e"; ECHONB="echo -n" ;; "DragonFly"|"FreeBSD"|"NetBSD") ECHOCMD="echo -e"; ECHONB="echo -n" ;;
"MacOS") ECHOCMD="echo"; ECHONB="echo -n" ;; "MacOS") ECHOCMD="echo"; ECHONB="/bin/echo -n" ;;
"Solaris") ECHOCMD="echo" ;; "Solaris") ECHOCMD="echo" ;;
"Linux") "Linux")
# Check if dash is used (Debian/Ubuntu) # Check if dash is used (Debian/Ubuntu)