From b595cc0fb5f0dafe3604f2d2d4915de1acd9c754 Mon Sep 17 00:00:00 2001
From: hlein <hlein@korelogic.com>
Date: Mon, 6 Mar 2017 00:41:21 -0700
Subject: Various cleanups (#363)

* Typo fix.

* Style change: always use $(), never ``.

The Lynis code already mostly used $(), but backticks were sprinkled
around.  Converted all of them.

* Lots of minor spelling/typo fixes.

FWIW these were found with:

  find . -type f -print0 | xargs -0 cat | aspell list | sort -u | egrep '^[a-z]+$' | less

And then reviewing the list to pick out things that looked like
misspelled words as opposed to variables, etc., and then manual
inspection of context to determine the intention.
---
 include/tests_storage | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'include/tests_storage')

diff --git a/include/tests_storage b/include/tests_storage
index 9cfa3410..8f9c91cd 100644
--- a/include/tests_storage
+++ b/include/tests_storage
@@ -35,10 +35,10 @@
         FOUND=0
         LogText "Test: Checking USB storage driver in directory /etc/modprobe.d and configuration file /etc/modprobe.conf"
         if [ -d /etc/modprobe.d ]; then
-            FIND=`ls /etc/modprobe.d/* 2> /dev/null`
+            FIND=$(ls /etc/modprobe.d/* 2> /dev/null)
             if [ ! "${FIND}" = "" ]; then
-                FIND=`${EGREPBINARY} -r "install usb[-_]storage /bin/(false|true)" /etc/modprobe.d/* | ${GREPBINARY} -v "#"`
-                FIND2=`${EGREPBINARY} -r "^blacklist usb[-_]storage" /etc/modprobe.d/*`
+                FIND=$(${EGREPBINARY} -r "install usb[-_]storage /bin/(false|true)" /etc/modprobe.d/* | ${GREPBINARY} -v "#")
+                FIND2=$(${EGREPBINARY} -r "^blacklist usb[-_]storage" /etc/modprobe.d/*)
                 if [ ! "${FIND}" = "" -o ! "${FIND2}" = "" ]; then
                     FOUND=1
                     LogText "Result: found usb-storage driver in disabled state (blacklisted)"
@@ -48,7 +48,7 @@
             fi
         fi
         if [ -f /etc/modprobe.conf ]; then
-            FIND=`${EGREPBINARY} "install usb[-_]storage /bin/(false|true)" /etc/modprobe.conf | ${GREPBINARY} "usb-storage" | ${GREPBINARY} -v "#"`
+            FIND=$(${EGREPBINARY} "install usb[-_]storage /bin/(false|true)" /etc/modprobe.conf | ${GREPBINARY} "usb-storage" | ${GREPBINARY} -v "#")
             if [ ! "${FIND}" = "" ]; then
                 FOUND=1
                 LogText "Result: found usb-storage driver in disabled state"
@@ -77,11 +77,11 @@
         USBDEVICESPATH="/sys/bus/usb/devices/usb"
         for device in "${USBDEVICESPATH}"*; do
             if [ -e "${device}/authorized" ] || [ -e "${device}/authorized_default" ]; then
-                if [ `cat "${device}/authorized_default"` -eq 1 ]; then
+                if [ $(cat "${device}/authorized_default") -eq 1 ]; then
                     FOUND=1
                     LogText "Test: ${device} is authorized by default"
                     Report "usb_authorized_default_device[]=${device}"
-                elif [ `cat "${device}/authorized"` -eq 1 ]; then
+                elif [ $(cat "${device}/authorized") -eq 1 ]; then
                     FOUND=1
                     LogText "Test: ${device} is authorized currently"
                     Report "usb_authorized_device[]=${device}"
@@ -112,10 +112,10 @@
         FOUND=0
         LogText "Test: Checking firewire storage driver in directory /etc/modprobe.d and configuration file /etc/modprobe.conf"
         if [ -d /etc/modprobe.d ]; then
-            FIND=`ls /etc/modprobe.d/* 2> /dev/null`
+            FIND=$(ls /etc/modprobe.d/* 2> /dev/null)
             if [ ! "${FIND}" = "" ]; then
-                FIND1=`${EGREPBINARY} "blacklist (ohci1394|firewire[-_]ohci|firewire-core)" /etc/modprobe.d/* | ${GREPBINARY} -v "#"`
-                FIND2=`${EGREPBINARY} "install (ohci1394|firewire[-_]ohci|firewire-core) /bin/(false|true)" /etc/modprobe.d/* | ${GREPBINARY} -v "#"`
+                FIND1=$(${EGREPBINARY} "blacklist (ohci1394|firewire[-_]ohci|firewire-core)" /etc/modprobe.d/* | ${GREPBINARY} -v "#")
+                FIND2=$(${EGREPBINARY} "install (ohci1394|firewire[-_]ohci|firewire-core) /bin/(false|true)" /etc/modprobe.d/* | ${GREPBINARY} -v "#")
                 if [ ! "${FIND1}" = "" -o ! "${FIND2}" = "" ]; then
                     FOUND=1
                     LogText "Result: found firewire ohci driver in disabled state"
@@ -125,8 +125,8 @@
             fi
         fi
         if [ -f /etc/modprobe.conf ]; then
-            FIND1=`${EGREPBINARY} -r "blacklist (ohci1394|firewire[-_]ohci|firewire-core)" /etc/modprobe.conf | ${GREPBINARY} -v "#"`
-            FIND2=`${EGREPBINARY} -r "install (ohci1394|firewire[-_]ohci|firewire-core) /bin/(false|true)" /etc/modprobe.conf | ${GREPBINARY} -v "#"`
+            FIND1=$(${EGREPBINARY} -r "blacklist (ohci1394|firewire[-_]ohci|firewire-core)" /etc/modprobe.conf | ${GREPBINARY} -v "#")
+            FIND2=$(${EGREPBINARY} -r "install (ohci1394|firewire[-_]ohci|firewire-core) /bin/(false|true)" /etc/modprobe.conf | ${GREPBINARY} -v "#")
             if [ ! "${FIND1}" = "" -o ! "${FIND2}" = "" ]; then
                 FOUND=1
                 LogText "Result: found firewire ohci driver in disabled state"
-- 
cgit v1.2.3