tyler.durden
/
lynis
mirror of https://github.com/CISOfy/lynis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding --debug to Display function

This commit is contained in:
mboelen 2016-04-02 18:28:02 +02:00
parent 40d11eb37b
commit cab2b9071c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/functions
View File

@ -257,7 +257,7 @@
Display() Display()
{ {
INDENT=0; TEXT=""; RESULT=""; COLOR=""; SPACES=0 INDENT=0; TEXT=""; RESULT=""; COLOR=""; SPACES=0; SHOWDEBUG=0
while [ $# -ge 1 ]; do while [ $# -ge 1 ]; do
case $1 in case $1 in
--color) --color)
@ -269,6 +269,9 @@
YELLOW) COLOR=$YELLOW ;; YELLOW) COLOR=$YELLOW ;;
esac esac
;; ;;
--debug)
SHOWDEBUG=1
;;
--indent) --indent)
shift shift
INDENT=$1 INDENT=$1
@ -305,11 +308,12 @@
if [ ${QUIET} -eq 0 -o "${RESULT}" = "WARNING" ]; then if [ ${QUIET} -eq 0 -o "${RESULT}" = "WARNING" ]; then
# Display (counting with -m instead of -c, to support language locale) # Display (counting with -m instead of -c, to support language locale)
LINESIZE=`echo "${TEXT}" | wc -m | tr -d ' '` LINESIZE=`echo "${TEXT}" | wc -m | tr -d ' '`
if [ ${SHOWDEBUG} -eq 1 ]; then DEBUGTEXT=" [${PURPLE}DEBUG${NORMAL}]"; else DEBUGTEXT=""; fi
if [ ${INDENT} -gt 0 ]; then SPACES=`expr 62 - ${INDENT} - ${LINESIZE}`; fi if [ ${INDENT} -gt 0 ]; then SPACES=`expr 62 - ${INDENT} - ${LINESIZE}`; fi
if [ ${CRONJOB} -eq 0 ]; then if [ ${CRONJOB} -eq 0 ]; then
# Check if we already have already discovered a proper echo command tool. It not, set it default to 'echo'. # Check if we already have already discovered a proper echo command tool. It not, set it default to 'echo'.
if [ "${ECHOCMD}" = "" ]; then ECHOCMD="echo"; fi if [ "${ECHOCMD}" = "" ]; then ECHOCMD="echo"; fi
${ECHOCMD} "\033[${INDENT}C${TEXT}\033[${SPACES}C${RESULTPART}" ${ECHOCMD} "\033[${INDENT}C${TEXT}\033[${SPACES}C${RESULTPART}${DEBUGTEXT}"
else else
echo "${TEXT}${RESULTPART}" echo "${TEXT}${RESULTPART}"
fi fi