Improved screen output on FreeBSD and enhanced version detection on Gentoo

This commit is contained in:
mboelen 2014-12-10 11:08:15 +01:00
parent d2b7d3ed00
commit afa2d50aac

View File

@ -5,8 +5,8 @@
# Lynis # Lynis
# ------------------ # ------------------
# #
# Copyright 2007-2014, Michael Boelen (michael@rootkit.nl), The Netherlands # Copyright 2007-2015, Michael Boelen, CISOfy (michael.boelen@cisofy.com)
# Web site: http://www.rootkit.nl # Web site: https://cisofy.com
# #
# This software is licensed under GPL, version 3. See LICENSE file for # This software is licensed under GPL, version 3. See LICENSE file for
# usage of this software. # usage of this software.
@ -167,9 +167,7 @@
# E-smith # E-smith
if [ -e "/etc/e-smith-release" ]; then OS_FULLNAME=`cat /etc/e-smith-release`; fi if [ -e "/etc/e-smith-release" ]; then OS_FULLNAME=`cat /etc/e-smith-release`; fi
# Gentoo # Gentoo
if [ -e "/etc/gentoo-release" ]; then OS_FULLNAME=`cat /etc/gentoo-release | awk '{ print $5 }' | cut -d '.' -f1,2`; fi if [ -e "/etc/gentoo-release" ]; then OS_FULLNAME=`cat /etc/gentoo-release`; fi
# Red Hat and others # Red Hat and others
if [ -e "/etc/redhat-release" ]; then if [ -e "/etc/redhat-release" ]; then
@ -361,7 +359,7 @@
case ${OS} in case ${OS} in
"AIX") ECHOCMD="echo" ;; "AIX") ECHOCMD="echo" ;;
"DragonFly") ECHOCMD="echo -e"; ECHONB="echo -n" ;; "DragonFly"|"FreeBSD"|"NetBSD") ECHOCMD="echo -e"; ECHONB="echo -n" ;;
"MacOS") ECHOCMD="echo" ;; "MacOS") ECHOCMD="echo" ;;
"Solaris") ECHOCMD="echo" ;; "Solaris") ECHOCMD="echo" ;;
"Linux") "Linux")
@ -372,10 +370,9 @@
*) ECHOCMD="echo -e" ;; *) ECHOCMD="echo -e" ;;
esac esac
;; ;;
"NetBSD") ECHOCMD="echo -e"; ECHONB="echo -n" ;;
*) ECHOCMD="echo -e" ;; *) ECHOCMD="echo -e" ;;
esac esac
#================================================================================ #================================================================================
# Lynis - Copyright 2007-2014 Michael Boelen, CISOfy - https://cisofy.com # Lynis - Copyright 2007-2015 Michael Boelen, CISOfy - https://cisofy.com