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.

1 files changed, 19 insertions, 19 deletions

diff --git a/include/binaries b/include/binaries
index 25aa0649..81a9c99d 100644
--- a/include/binaries
+++ b/include/binaries
@@ -64,7 +64,7 @@
                 fi
 
                 # Add a space to make sure we discover a related directory if it was already scanned
-                FIND=`echo ${BINARY_PATHS_FOUND} | grep ", ${SCANDIR}"`
+                FIND=$(echo ${BINARY_PATHS_FOUND} | grep ", ${SCANDIR}")
                 if [ ! "${FIND}" = "" ]; then
                     SKIPDIR=1; LogText "Result: Skipping this directory as it was already scanned"
                 fi
@@ -72,7 +72,7 @@
                 if [ ${SKIPDIR} -eq 0 ]; then
                     BINARY_PATHS_FOUND="${BINARY_PATHS_FOUND}, ${SCANDIR}"
                     LogText "Directory ${SCANDIR} exists. Starting directory scanning..."
-                    FIND=`ls ${SCANDIR}`
+                    FIND=$(ls ${SCANDIR})
                     for I in ${FIND}; do
                         N=$((N + 1))
                         BINARY="${SCANDIR}/${I}"
@@ -114,7 +114,7 @@
                             chkrootkit)             CHKROOTKITFOUND=1;     CHKROOTKITBINARY="${BINARY}";           MALWARE_SCANNER_INSTALLED=1;           LogText "  Found known binary: chkrootkit (malware scanner) - ${BINARY}"                                  ;;
                             comm)                   COMMBINARY="${BINARY}";                                                                               LogText "  Found known binary: comm (file compare) - ${BINARY}"                                           ;;
                             csum)                   CSUMFOUND=1;           CSUMBINARY="${BINARY}";                                                        LogText "  Found known binary: csum (hashing tool on AIX) - ${BINARY}"                                    ;;
-                            curl)                   CURLFOUND=1;           CURLBINARY="${BINARY}"; CURLVERSION=`${BINARY} --version | grep "^curl" | awk '{ if ($1=="curl") { print $2 }}'`; LogText "  Found known binary: curl (browser) - ${BINARY}"             ;;
+                            curl)                   CURLFOUND=1;           CURLBINARY="${BINARY}"; CURLVERSION=$(${BINARY} --version | grep "^curl" | awk '{ if ($1=="curl") { print $2 }}'); LogText "  Found known binary: curl (browser) - ${BINARY}"             ;;
                             cut)                    CUTBINARY="${BINARY}"
                                                     LogText "  Found known binary: cut (text stream editor) - ${BINARY}"
                             ;;
@@ -127,14 +127,14 @@
                             domainname)             DOMAINNAMEFOUND=1;     DOMAINNAMEBINARY="${BINARY}";                                                  LogText "  Found known binary: domainname (NIS domain) - ${BINARY}"                                       ;;
                             dpkg)                   DPKGBINARY="${BINARY}";                                                                               LogText "  Found known binary: dpkg (package management) - ${BINARY}"                                     ;;
                             egrep)                  EGREPFOUND=1;          EGREPBINARY=${BINARY};                                                         LogText "  Found known binary: egrep (text search) - ${BINARY}"                                           ;;
-                            exim)                   EXIMFOUND=1;           EXIMBINARY="${BINARY}";                 EXIMVERSION=`${BINARY} -bV | grep 'Exim version' | awk '{ print $3 }' | xargs`; LogText "Found ${BINARY} (version ${EXIMVERSION})"               ;;
+                            exim)                   EXIMFOUND=1;           EXIMBINARY="${BINARY}";                 EXIMVERSION=$(${BINARY} -bV | grep 'Exim version' | awk '{ print $3 }' | xargs); LogText "Found ${BINARY} (version ${EXIMVERSION})"               ;;
                             fail2ban-server)                   FAIL2BANFOUND=1;           FAIL2BANBINARY="${BINARY}";                                                        LogText "  Found known binary: fail2ban (IPS tool) - ${BINARY}"                                            ;;
                             file)                   FILEBINARY="${BINARY}"
                                                     LogText "  Found known binary: file (file type detection) - ${BINARY}"
                             ;;
                             find)                   FINDFOUND=1;           FINDBINARY="${BINARY}";                                                        LogText "  Found known binary: find (search tool) - ${BINARY}"                                            ;;
                             g++)                    GPLUSPLUSFOUND=1;      GPLUSPLUSBINARY="${BINARY}";            COMPILER_INSTALLED=1;                  LogText "  Found known binary: g++ (compiler) - ${BINARY}"                                                ;;
-                            # additional file check due to existance /usr/libexec/gcc (directory)
+                            # additional file check due to existence /usr/libexec/gcc (directory)
                             gcc)                    if [ -f ${BINARY} ]; then GCCBINARY="${BINARY}";               COMPILER_INSTALLED=1;                  LogText "  Found known binary: gcc (compiler) - ${BINARY}";                                            fi ;;
                             getent)                 GETENT_BINARY="${BINARY}"
                                                     LogText "  Found known binary: getent (query tool for name service switch libraries) - ${BINARY}"
@@ -173,7 +173,7 @@
                             lsattr)                 LSATTRFOUND=1;         LSATTRBINARY="${BINARY}";                                                      LogText "  Found known binary: lsattr (file attributes) - ${BINARY}"                                      ;;
                             lsmod)                  LSMODFOUND=1;          LSMODBINARY="${BINARY}";                                                       LogText "  Found known binary: lsmod (kernel modules) - ${BINARY}"                                        ;;
                             lsof)                   LSOFFOUND=1;           LSOFBINARY="${BINARY}";                                                        LogText "  Found known binary: lsof (open files) - ${BINARY}"                                             ;;
-                            lynx)                   LYNXFOUND=1;           LYNXBINARY="${BINARY}"; LYNXVERSION=`${BINARY} -version | grep "^Lynx Version" | cut -d ' ' -f3`; LogText "Found known binary: lynx (browser) - ${BINARY} (version ${LYNXVERSION})"      ;;
+                            lynx)                   LYNXFOUND=1;           LYNXBINARY="${BINARY}"; LYNXVERSION=$(${BINARY} -version | grep "^Lynx Version" | cut -d ' ' -f3); LogText "Found known binary: lynx (browser) - ${BINARY} (version ${LYNXVERSION})"      ;;
                             maldet)                 LMDFOUND=1;            LMDBINARY="${BINARY}";                  MALWARE_SCANNER_INSTALLED=1;           LogText "  Found known binary: maldet (Linux Malware Detect, malware scanner) - ${BINARY}"                ;;
                             md5)                    MD5FOUND=1;            MD5BINARY="${BINARY}";                                                         LogText "  Found known binary: md5 (hash tool) - ${BINARY}"                                               ;;
                             md5sum)                 MD5FOUND=1;            MD5BINARY="${BINARY}";                                                         LogText "  Found known binary: md5sum (hash tool) - ${BINARY}"                                            ;;
@@ -182,17 +182,17 @@
                                                     LogText "  Found known binary: mount (disk utility) - ${BINARY}"
                             ;;
                             mtree)                  MTREEFOUND=1;          MTREEBINARY="${BINARY}";                                                       LogText "  Found known binary: mtree (mapping directory tree) - ${BINARY}"                                ;;
-                            mysql)                  MYSQLCLIENTFOUND=1;    MYSQLCLIENTBINARY="${BINARY}"; MYSQLCLIENTVERSION=`${BINARY} -V | awk '{ if ($4=="Distrib") { print $5 }}' | sed 's/,//g'` ;  LogText "Found ${BINARY} (version: ${MYSQLCLIENTVERSION})" ;;
+                            mysql)                  MYSQLCLIENTFOUND=1;    MYSQLCLIENTBINARY="${BINARY}"; MYSQLCLIENTVERSION=$(${BINARY} -V | awk '{ if ($4=="Distrib") { print $5 }}' | sed 's/,//g') ;  LogText "Found ${BINARY} (version: ${MYSQLCLIENTVERSION})" ;;
                             netstat)                NETSTATFOUND=1;        NETSTATBINARY="${BINARY}";                                                     LogText "  Found known binary: netstat (network statistics) - ${BINARY}"                                  ;;
                             nft)                    NFTFOUND=1;            NFTBINARY="${BINARY}";                                                         LogText "  Found known binary: nft (nftables client) - ${BINARY}"                                         ;;
-                            nmap)                   NMAPFOUND=1;           NMAPBINARY="${BINARY}"; NMAPVERSION=`${BINARY} -V | grep "^Nmap version" | awk '{ print $3 }'`; LogText "Found ${BINARY} (version ${NMAPVERSION})"                                       ;;
+                            nmap)                   NMAPFOUND=1;           NMAPBINARY="${BINARY}"; NMAPVERSION=$(${BINARY} -V | grep "^Nmap version" | awk '{ print $3 }'); LogText "Found ${BINARY} (version ${NMAPVERSION})"                                       ;;
                             ntpq)                   NTPQFOUND=1;           NTPQBINARY="${BINARY}";                                                        LogText "  Found known binary ntpq (time daemon client) - ${BINARY}"                                      ;;
                             osiris)                 OSIRISFOUND=1;         OSIRISBINARY="${BINARY}";                                                      LogText "  Found known binary: osiris - ${BINARY}"                                                        ;;
-                            openssl)                OPENSSLFOUND=1;        OPENSSLBINARY="${BINARY}"; OPENSSLVERSION=`${BINARY} version 2> /dev/null | head -n 1 | awk '{ print $2 }' | xargs`; LogText "Found ${BINARY} (version ${OPENSSLVERSION})"               ;;
+                            openssl)                OPENSSLFOUND=1;        OPENSSLBINARY="${BINARY}"; OPENSSLVERSION=$(${BINARY} version 2> /dev/null | head -n 1 | awk '{ print $2 }' | xargs); LogText "Found ${BINARY} (version ${OPENSSLVERSION})"               ;;
                             pacman)                 PACMANFOUND=1;         PACMANBINARY="${BINARY}";                                                      LogText "  Found known binary: pacman (package manager) - ${BINARY}"                                      ;;
-                            perl)                   PERLFOUND=1;           PERLBINARY="${BINARY}"; PERLVERSION=`${BINARY} -V:version | sed 's/^version=//' | sed 's/;//' | xargs`; LogText "Found ${BINARY} (version ${PERLVERSION})"                               ;;
+                            perl)                   PERLFOUND=1;           PERLBINARY="${BINARY}"; PERLVERSION=$(${BINARY} -V:version | sed 's/^version=//' | sed 's/;//' | xargs); LogText "Found ${BINARY} (version ${PERLVERSION})"                               ;;
                             pgrep)                  PGREPBINARY=${BINARY};                                                                                LogText "  Found known binary: pgrep (search in process list) - ${BINARY}"                                ;;
-                            php)                    PHPFOUND=1;            PHPBINARY="${BINARY}"; PHPVERSION=`${BINARY} -v | awk '{ if ($1=="PHP") { print $2 }}' | head -1`; LogText "Found known binary: php (programming language intrepreter) - ${BINARY} (version ${PHPVERSION})" ;;
+                            php)                    PHPFOUND=1;            PHPBINARY="${BINARY}"; PHPVERSION=$(${BINARY} -v | awk '{ if ($1=="PHP") { print $2 }}' | head -1); LogText "Found known binary: php (programming language interpreter) - ${BINARY} (version ${PHPVERSION})" ;;
                             pkg)
                                                     PKG_BINARY="${BINARY}"
                                                     LogText "  Found known binary: pkg (software package administration) - ${BINARY}"
@@ -205,9 +205,9 @@
                             ps)                     PSFOUND=1;             PSBINARY="${BINARY}";                                                          LogText "  Found known binary: ps (process listing) - ${BINARY}"                                          ;;
                             puppet)                 PUPPETFOUND=1;         PUPPETBINARY="${BINARY}";                                                      LogText "  Found known binary: puppet (automation tooling) - ${BINARY}"                                   ;;
                             puppetmasterd)          PUPPETMASTERDFOUND=1;  PUPPETMASTERDBINARY="${BINARY}";                                               LogText "  Found known binary: puppetmasterd (puppet master daemon) - ${BINARY}"                          ;;
-                            python)                 PYTHONFOUND=1;         PYTHONBINARY="${BINARY}"; PYTHONVERSION=`${BINARY}  --version 2>&1 | sed 's/^Python //'`; LogText "Found known binary: ${I} (programming language interpreter) - ${BINARY} (version ${PYTHONVERSION})" ;;
-                            python2)                PYTHON2FOUND=1;        PYTHON2BINARY="${BINARY}"; PYTHON2VERSION=`${BINARY}  --version 2>&1 | sed 's/^Python //'`; LogText "Found known binary: ${I} (programming language interpreter) - ${BINARY} (version ${PYTHON2VERSION})" ;;
-                            python3)                PYTHON3FOUND=1;        PYTHON3BINARY="${BINARY}"; PYTHON3VERSION=`${BINARY}  --version 2>&1 | sed 's/^Python //'`; LogText "Found known binary: ${I} (programming language interpreter) - ${BINARY} (version ${PYTHON3VERSION})" ;;
+                            python)                 PYTHONFOUND=1;         PYTHONBINARY="${BINARY}"; PYTHONVERSION=$(${BINARY}  --version 2>&1 | sed 's/^Python //'); LogText "Found known binary: ${I} (programming language interpreter) - ${BINARY} (version ${PYTHONVERSION})" ;;
+                            python2)                PYTHON2FOUND=1;        PYTHON2BINARY="${BINARY}"; PYTHON2VERSION=$(${BINARY}  --version 2>&1 | sed 's/^Python //'); LogText "Found known binary: ${I} (programming language interpreter) - ${BINARY} (version ${PYTHON2VERSION})" ;;
+                            python3)                PYTHON3FOUND=1;        PYTHON3BINARY="${BINARY}"; PYTHON3VERSION=$(${BINARY}  --version 2>&1 | sed 's/^Python //'); LogText "Found known binary: ${I} (programming language interpreter) - ${BINARY} (version ${PYTHON3VERSION})" ;;
                             readlink)               READLINKFOUND=1;       READLINKBINARY="${BINARY}";                                                    LogText "  Found known binary: readlink (follows symlinks) - ${BINARY}"                                   ;;
                             rkhunter)               RKHUNTERFOUND=1;       RKHUNTERBINARY="${BINARY}";             MALWARE_SCANNER_INSTALLED=1;           LogText "  Found known binary: rkhunter (malware scanner) - ${BINARY}"                                    ;;
                             rootsh)                 ROOTSHFOUND=1;         ROOTSHBINARY="${BINARY}";                                                      LogText "  Found known binary: rootsh (wrapper for shells) - ${BINARY}"                                   ;;
@@ -223,21 +223,21 @@
                             ;;
                             sestatus)               SESTATUSFOUND=1;       SESTATUSBINARY="${BINARY}";                                                    LogText "  Found known binary: sestatus (SELinux client) - ${BINARY}"                                     ;;
                             slocate)                LOCATEFOUND=1;         LOCATEBINARY="${BINARY}";                                                      LogText "  Found known binary: slocate (file database) - ${BINARY}"                                       ;;
-                            smbd)                   SMBDFOUND=1;           SMBDBINARY="${BINARY}"; if [ "${OS}" = "macOS" ]; then SMBDVERSION="unknown"; else SMBDVERSION=`${BINARY} -V | grep "^Version" | awk '{ print $2 }'`; fi; LogText "Found ${BINARY} (version ${SMBDVERSION})"                                            ;;
+                            smbd)                   SMBDFOUND=1;           SMBDBINARY="${BINARY}"; if [ "${OS}" = "macOS" ]; then SMBDVERSION="unknown"; else SMBDVERSION=$(${BINARY} -V | grep "^Version" | awk '{ print $2 }'); fi; LogText "Found ${BINARY} (version ${SMBDVERSION})"                                            ;;
                             smtpctl)                SMTPCTLBINARY="${BINARY}";                                                                            LogText "  Found known binary: smtpctl (OpenSMTPD client) - ${BINARY}"                                    ;;
                             showmount)              SHOWMOUNTFOUND=1;      SHOWMOUNTBINARY="${BINARY}";                                                   LogText "  Found known binary: showmount (NFS mounts) - ${BINARY}"                                        ;;
                             sockstat)               SOCKSTATFOUND=1;       SOCKSTATBINARY="${BINARY}";                                                    LogText "  Found known binary: sockstat (open network sockets) - ${BINARY}"                               ;;
                             sort)                   SORTBINARY="${BINARY}";                                                                               LogText "  Found known binary: sort (sort data streams) - ${BINARY}"                               ;;
                             squid)                  SQUIDFOUND=1;          SQUIDBINARY="${BINARY}";                                                       LogText "  Found known binary: squid (proxy) - ${BINARY}"                                                 ;;
                             ss)                     SSFOUND=1;             SSBINARY="${BINARY}";                                                          LogText "  Found known binary: ss (show sockets) - ${BINARY}"                                             ;;
-                            sshd)                   SSHDFOUND=1;           SSHDBINARY="${BINARY}"; SSHDVERSION=`${BINARY} -t -d 2>&1 | head -n 1 | awk '{ print $4 }' | cut -d '_' -f2 | tr -d ',' | tr -d '\r'`; LogText "Found ${BINARY} (version ${SSHDVERSION})"            ;;
+                            sshd)                   SSHDFOUND=1;           SSHDBINARY="${BINARY}"; SSHDVERSION=$(${BINARY} -t -d 2>&1 | head -n 1 | awk '{ print $4 }' | cut -d '_' -f2 | tr -d ',' | tr -d '\r'); LogText "Found ${BINARY} (version ${SSHDVERSION})"            ;;
                             stat)                   STATFOUND=1;           STATBINARY="${BINARY}";                                                        LogText "  Found known binary: stat (file information) - ${BINARY}"                                       ;;
                             strings)                STRINGSFOUND=1;        STRINGSBINARY="${BINARY}";                                                     LogText "  Found known binary: strings (text strings search) - ${BINARY}"                                 ;;
                             sha1|sha1sum|shasum)    SHA1SUMFOUND=1;        SHA1SUMBINARY="${BINARY}";                                                     LogText "  Found known binary: sha1/sha1sum/shasum (crypto hashing) - ${BINARY}"                          ;;
                             sha256|sha256sum)       SHA256SUMFOUND=1;      SHA256SUMBINARY="${BINARY}";                                                   LogText "  Found known binary: sha256/sha256sum (crypto hashing) - ${BINARY}"                             ;;
                             ssh-keyscan)            SSHKEYSCANFOUND=1;     SSHKEYSCANBINARY="${BINARY}";                                                  LogText "  Found known binary: ssh-keyscan (scanner for SSH keys) - ${BINARY}"                            ;;
                             sysctl)                 SYSCTLFOUND=1;         SYSCTLBINARY="${BINARY}";                                                      LogText "  Found known binary: sysctl (kernel parameters) - ${BINARY}"                                    ;;
-                            syslog-ng)              SYSLOGNGFOUND=1;       SYSLOGNGBINARY="${BINARY}"; SYSLOGNGVERSION=`${BINARY} -V 2>&1 | grep "^syslog-ng" | awk '{ print $2 }'`; LogText "Found ${BINARY} (version ${SYSLOGNGVERSION})"                         ;;
+                            syslog-ng)              SYSLOGNGFOUND=1;       SYSLOGNGBINARY="${BINARY}"; SYSLOGNGVERSION=$(${BINARY} -V 2>&1 | grep "^syslog-ng" | awk '{ print $2 }'); LogText "Found ${BINARY} (version ${SYSLOGNGVERSION})"                         ;;
                             systemctl)              SYSTEMCTLFOUND=1;      SYSTEMCTLBINARY="${BINARY}"; SERVICE_MANAGER="systemd";                        LogText "  Found known binary: systemctl (client to systemd) - ${BINARY}"                                 ;;
                             timedatectl)            TIMEDATECTLFOUND=1;    TIMEDATECTL="${BINARY}";                                                       LogText "  Found known binary: timedatectl (timedate client) - ${BINARY}"                                 ;;
                             tr)                     TRFOUND=1;             TRBINARY="${BINARY}";                                                          LogText "  Found known binary: tr (text transformation) - ${BINARY}"                                      ;;
@@ -254,7 +254,7 @@
                             wc)                     WCBINARY="${BINARY}"
                                                     LogText "  Found known binary: wc (word count) - ${BINARY}"
                             ;;
-                            wget)                   WGETFOUND=1;           WGETBINARY="${BINARY}"; WGETVERSION=`${BINARY} -V | grep "^GNU Wget" | awk '{ print $3 }'`; LogText "Found ${BINARY} (version ${WGETVERSION})"                                           ;;
+                            wget)                   WGETFOUND=1;           WGETBINARY="${BINARY}"; WGETVERSION=$(${BINARY} -V | grep "^GNU Wget" | awk '{ print $3 }'); LogText "Found ${BINARY} (version ${WGETVERSION})"                                           ;;
                             yum)                    YUMFOUND=1;            YUMBINARY="${BINARY}";                                                         LogText "  Found known binary: yum (package manager) - ${BINARY}"                                         ;;
                             xargs)                  XARGSBINARY="${BINARY}"
                                                     LogText "  Found known binary: xargs (command output redirection) - ${BINARY}"
@@ -271,7 +271,7 @@
                 LogText "Result: Directory ${SCANDIR} does NOT exist"
             fi
         done
-        BINARY_PATHS_FOUND=`echo ${BINARY_PATHS_FOUND} | sed 's/^, //g' | sed 's/ //g'`
+        BINARY_PATHS_FOUND=$(echo ${BINARY_PATHS_FOUND} | sed 's/^, //g' | sed 's/ //g')
         LogText "Discovered directories: ${BINARY_PATHS_FOUND}"
         Report "binary_paths=${BINARY_PATHS_FOUND}"
         BINARY_SCAN_FINISHED=1