Rename of logtext and report functions, upcoming year change

1 files changed, 24 insertions, 24 deletions

diff --git a/include/tests_tooling b/include/tests_tooling
index 0ae7f194..95f4f431 100644
--- a/include/tests_tooling
+++ b/include/tests_tooling
@@ -5,7 +5,7 @@
 #   Lynis
 # ------------------
 #
-# Copyright 2007-2015, Michael Boelen, CISOfy (michael.boelen@cisofy.com)
+# Copyright 2007-2016, Michael Boelen, CISOfy (michael.boelen@cisofy.com)
 # Web site: https://cisofy.com
 #
 # Lynis comes with ABSOLUTELY NO WARRANTY. This is free software, and you are
@@ -42,28 +42,28 @@
 
         # Cfengine
         if [ ! "${CFAGENTBINARY}" = "" ]; then
-            logtext "Result: CFEngine (cfagent) is installed (${CFAGENTBINARY})"
+            LogText "Result: CFEngine (cfagent) is installed (${CFAGENTBINARY})"
             AUTOMATION_TOOL_FOUND=1
             CFENGINE_AGENT_FOUND=1
-            report "automation_tool_running[]=cf-agent"
+            Report "automation_tool_running[]=cf-agent"
             Display --indent 4 --text "Found: Cfengine (cfagent)" --result FOUND --color GREEN
         fi
         OTHER_CFENGINE_LOCATIONS="/var/cfengine/bin"
         for I in ${OTHER_CFENGINE_LOCATIONS}; do
             if [ -d ${I} ]; then
                 if [ -f ${I}/cf-agent ]; then
-                    logtext "Result: found CFEngine agent (cf-agent) in ${I}"
+                    LogText "Result: found CFEngine agent (cf-agent) in ${I}"
                     AUTOMATION_TOOL_FOUND=1
                     CFENGINE_AGENT_FOUND=1
-                    report "automation_tool_running[]=cf-agent"
+                    Report "automation_tool_running[]=cf-agent"
                     Display --indent 4 --text "Found: CFEngine (cf-agent)" --result FOUND --color GREEN
                 fi
                 IsRunning "cf-server"
                 if [ ${RUNNING} -eq 1 ]; then
-                    logtext "Result: found CFEngine server"
+                    LogText "Result: found CFEngine server"
                     AUTOMATION_TOOL_FOUND=1
                     CFENGINE_SERVER_RUNNING=1
-                    report "automation_tool_running[]=cf-server"
+                    Report "automation_tool_running[]=cf-server"
                     Display --indent 4 --text "Found: CFEngine (cf-server)" --result FOUND --color GREEN
                 fi
             fi
@@ -76,57 +76,57 @@
                 if [ -f ${I}/chef-client ]; then
                     CHEFCLIENTBINARY="${I}/chef-client"
                     AUTOMATION_TOOL_FOUND=1
-                    report "automation_tool_running[]=chef-client"
+                    Report "automation_tool_running[]=chef-client"
                     Display --indent 4 --text "Found: Chef client (chef-client)" --result FOUND --color GREEN
-                    logtext "Result: found chef-client (chef client daemon) in ${I}"
+                    LogText "Result: found chef-client (chef client daemon) in ${I}"
                 fi
                 if [ -f ${I}/erchef ]; then
                     CHEFSERVERBINARY="${I}/erchef"
-                    logtext "Result: Chef Server (erchef) is installed (${CHEFSERVERBINARY})"
+                    LogText "Result: Chef Server (erchef) is installed (${CHEFSERVERBINARY})"
                     AUTOMATION_TOOL_FOUND=1
-                    report "automation_tool_running[]=chef-server"
+                    Report "automation_tool_running[]=chef-server"
                     Display --indent 4 --text "Found: Chef Server (erchef)" --result FOUND --color GREEN
-                    logtext "Result: found erchef (chef server daemon) in ${I}"
+                    LogText "Result: found erchef (chef server daemon) in ${I}"
                 fi
             fi
         done
 
         # Puppet
         if [ ! "${PUPPETBINARY}" = "" ]; then
-            logtext "Result: Puppet is installed (${PUPPETBINARY})"
+            LogText "Result: Puppet is installed (${PUPPETBINARY})"
             AUTOMATION_TOOL_FOUND=1
-            report "automation_tool_running[]=puppet-agent"
+            Report "automation_tool_running[]=puppet-agent"
             Display --indent 4 --text "Found: Puppet (agent)" --result FOUND --color GREEN
         fi
         IsRunning "puppet master"
         if [ ${RUNNING} -eq 1 ]; then
-            logtext "Result: found puppet master"
+            LogText "Result: found puppet master"
             PUPPET_MASTER_RUNNING=1
-            report "automation_tool_running[]=puppet-master"
+            Report "automation_tool_running[]=puppet-master"
             Display --indent 4 --text "Found: Puppet (master)" --result FOUND --color GREEN
         fi
 
         # SaltStack
         if [ ! "${SALTMINIONBINARY}" = "" ]; then
-            logtext "Result: SaltStack (salt-minion) is installed (${SALTMINIONBINARY})"
+            LogText "Result: SaltStack (salt-minion) is installed (${SALTMINIONBINARY})"
             AUTOMATION_TOOL_FOUND=1
             SALT_MINION_RUNNING=1
-            report "automation_tool_running[]=saltstack-minion"
+            Report "automation_tool_running[]=saltstack-minion"
             Display --indent 4 --text "Found: SaltStack minion (salt-minion)" --result FOUND --color GREEN
         fi
         if [ ! "${SALTMASTERBINARY}" = "" ]; then
-            logtext "Result: SaltStack (salt-master) is installed (${SALTMASTERBINARY})"
+            LogText "Result: SaltStack (salt-master) is installed (${SALTMASTERBINARY})"
             AUTOMATION_TOOL_FOUND=1
             SALT_MASTER_RUNNING=1
-            report "automation_tool_running[]=saltstack-minion"
+            Report "automation_tool_running[]=saltstack-minion"
             Display --indent 4 --text "Found: SaltStack master (salt-master)" --result FOUND --color GREEN
           else
             IsRunning "salt-master"
             if [ ${RUNNING} -eq 1 ]; then
-                logtext "Result: found SaltStack (master)"
+                LogText "Result: found SaltStack (master)"
                 AUTOMATION_TOOL_FOUND=1
                 SALT_MASTER_RUNNING=1
-                report "automation_tool_running[]=saltstack-master"
+                Report "automation_tool_running[]=saltstack-master"
                 Display --indent 4 --text "Found: SaltStack (master)" --result FOUND --color GREEN
             fi
         fi
@@ -150,10 +150,10 @@
 #
 #################################################################################
 #
-    report "automation_tool_present=${AUTOMATION_TOOL_FOUND}"
+    Report "automation_tool_present=${AUTOMATION_TOOL_FOUND}"
 
 
     wait_for_keypress
 #
 #================================================================================
-# Lynis - Copyright 2007-2015, Michael Boelen, CISOfy - https://cisofy.com
+# Lynis - Copyright 2007-2016, Michael Boelen, CISOfy - https://cisofy.com