Optimization: Replace grep|wc -l combination with grep -c.

This commit is contained in:
samson 2018-12-05 13:59:04 +08:00
parent 9ab816da0d
commit 73c1e12910
9 changed files with 11 additions and 11 deletions

View File

@ -32,10 +32,10 @@ audit () {
crit "$FILE does not exist"
FNRET=2
else
COUNT=$(sed -e '/^#/d' -e '/^[ \t][ \t]*#/d' -e 's/#.*$//' -e '/^$/d' $FILE | grep "${OPTIONS}" | wc -l)
COUNT=$(sed -e '/^#/d' -e '/^[ \t][ \t]*#/d' -e 's/#.*$//' -e '/^$/d' $FILE | grep -c "${OPTIONS}")
if [ $COUNT -gt 0 ]; then
ok "$OPTIONS is set in $FILE."
VALUE=$(sed -e '/^#/d' -e '/^[ \t][ \t]*#/d' -e 's/#.*$//' -e '/^$/d' $FILE | grep ".*[[:space:]].*${OPTIONS}[[:space:]].*${OPVALUE}" | wc -l)
VALUE=$(sed -e '/^#/d' -e '/^[ \t][ \t]*#/d' -e 's/#.*$//' -e '/^$/d' $FILE | grep -c ".*[[:space:]].*${OPTIONS}[[:space:]].*${OPVALUE}")
if [ $VALUE -eq 0 ]; then
crit "$OPTIONS value is incorrect in $FILE"
FNRET=4

View File

@ -28,7 +28,7 @@ audit ()
FNRET=1
else
ok "$NOPASSWD is not set on $FILE, it's ok"
if [ $(grep $NOPASSWD $INCLUDFILE | wc -l) -gt 0 ]; then
if [ $(grep -c $NOPASSWD $INCLUDFILE) -gt 0 ]; then
crit "$NOPASSWD is set on $INCLUDFILE, it's error conf"
FNRET=1
else

View File

@ -28,7 +28,7 @@ audit ()
FNRET=1
else
ok "$NOAUTH is not set on $FILE, it's ok"
if [ $(grep $NOAUTH $INCLUDFILE | wc -l) -gt 0 ]; then
if [ $(grep -c $NOAUTH $INCLUDFILE) -gt 0 ]; then
crit "$NOAUTH is set on $INCLUDFILE, it's error conf"
FNRET=1
else

View File

@ -18,7 +18,7 @@ TARGETNAME='ctrl-alt-del.target'
# This function will be called if the script status is on enabled / audit mode
audit () {
if [ $(find /lib/systemd/ /etc/systemd/ -name ctrl-alt-del.target -exec ls -l {} \; | grep "/dev/null" | wc -l) -ne $(find /lib/systemd/ /etc/systemd/ -name ctrl-alt-del.target -exec ls -l {} \; | wc -l) ]; then
if [ $(find /lib/systemd/ /etc/systemd/ -name ctrl-alt-del.target -exec ls -l {} \; | grep -c "/dev/null") -ne $(find /lib/systemd/ /etc/systemd/ -name ctrl-alt-del.target -exec ls -l {} \; | wc -l) ]; then
crit "$TARGETNAME is enabled."
FNRET=1
else

View File

@ -17,8 +17,8 @@ VIRULSERVER='clamav-daemon'
# This function will be called if the script status is on enabled / audit mode
audit () {
if [ $(dpkg -l | grep $VIRULSERVER | wc -l) -ge 1 ]; then
if [ $(systemctl | grep $VIRULSERVER | grep "active running" | wc -l) -ne 1 ]; then
if [ $(dpkg -l | grep -c $VIRULSERVER) -ge 1 ]; then
if [ $(systemctl | grep $VIRULSERVER | grep -c "active running") -ne 1 ]; then
crit "$VIRULSERVER is not runing"
FNRET=2
else

View File

@ -19,7 +19,7 @@ UPDATE_SERVER='clamav-freshclam'
# This function will be called if the script status is on enabled / audit mode
audit () {
if [ $(systemctl | grep $VIRULSERVER | grep "active running" | wc -l) -ne 1 ]; then
if [ $(systemctl | grep $VIRULSERVER | grep -c "active running") -ne 1 ]; then
crit "$VIRULSERVER is not runing"
FNRET=1
else

View File

@ -18,7 +18,7 @@ KEYWORD='promisc'
# This function will be called if the script status is on enabled / audit mode
audit () {
COUNT=$(ip link | grep -i "${KEYWORD}" | wc -l)
COUNT=$(ip link | grep -ic "${KEYWORD}")
if [ $COUNT -gt 0 ]; then
crit "The total number of network interfaces with ${KEYWORD} mode set is ${COUNT}"
FNRET=1

View File

@ -32,7 +32,7 @@ audit () {
FNRET=2
else
ok "$FILE exists, checking configuration"
VALUE=$(grep -v "^#" $FILE | grep -i "$PATTERN" | wc -l)
VALUE=$(grep -v "^#" $FILE | grep -ic "$PATTERN")
if [ $VALUE -gt 0 ]; then
VALUE=$(grep $PATTERN $FILE | grep -v '^#' | awk -F= '{print $2}')
if [ $VALUE == $SETVALUE ]; then

View File

@ -32,7 +32,7 @@ audit () {
FNRET=2
else
ok "$FILE exists, checking configuration"
VALUE=$(grep -v "^#" $FILE | grep -i "$PATTERN" | wc -l)
VALUE=$(grep -v "^#" $FILE | grep -ic "$PATTERN")
if [ $VALUE -gt 0 ]; then
VALUE=$(grep $PATTERN $FILE | grep -v '^#' | awk -F= '{print $2}')
if [ $VALUE == $SETVALUE ]; then