Small changes in naming, added binary paths to report file

This commit is contained in:
mboelen 2014-10-27 23:10:28 +01:00
parent 77e2705eb7
commit ca6c6d14fb

View File

@ -36,7 +36,7 @@
# Notes : Always perform test, dependency for many other tests # Notes : Always perform test, dependency for many other tests
Register --test-no FILE-7502 --weight L --network NO --description "Check all system binaries" Register --test-no FILE-7502 --weight L --network NO --description "Check all system binaries"
#if [ ${SKIPTEST} -eq 0 ]; then #if [ ${SKIPTEST} -eq 0 ]; then
SCANNEDPATHS=""; N=0 BINARY_PATHS_FOUND=""; N=0
Display --indent 2 --text "- Checking system binaries..." Display --indent 2 --text "- Checking system binaries..."
logtext "Status: Starting binary scan..." logtext "Status: Starting binary scan..."
for SCANDIR in ${BINPATHS}; do for SCANDIR in ${BINPATHS}; do
@ -61,7 +61,8 @@
fi fi
fi fi
FIND=`echo ${SCANNEDPATHS} | grep ", ${SCANDIR}"` # Add a space to make sure we discover a related directory if it was already scanned
FIND=`echo ${BINARY_PATHS_FOUND} | grep ", ${SCANDIR}"`
if [ ! "${FIND}" = "" ]; then if [ ! "${FIND}" = "" ]; then
SKIPDIR=1; logtext "Result: Skipping this directory as it was already scanned" SKIPDIR=1; logtext "Result: Skipping this directory as it was already scanned"
fi fi
@ -69,7 +70,7 @@
if [ ${SKIPDIR} -eq 0 ]; then if [ ${SKIPDIR} -eq 0 ]; then
logtext "Test: Checking binaries in directory ${SCANDIR}" logtext "Test: Checking binaries in directory ${SCANDIR}"
Display --indent 4 --text "- ${SCANDIR}" --result FOUND --color GREEN Display --indent 4 --text "- ${SCANDIR}" --result FOUND --color GREEN
SCANNEDPATHS="${SCANNEDPATHS}, ${SCANDIR}" BINARY_PATHS_FOUND="${BINARY_PATHS_FOUND}, ${SCANDIR}"
logtext "Directory ${SCANDIR} exists. Starting directory scanning..." logtext "Directory ${SCANDIR} exists. Starting directory scanning..."
FIND=`ls ${SCANDIR}` FIND=`ls ${SCANDIR}`
for I in ${FIND}; do for I in ${FIND}; do
@ -187,8 +188,9 @@
fi fi
logtextbreak logtextbreak
done done
SCANNEDPATHS=`echo ${SCANNEDPATHS} | sed 's/^, //g'` BINARY_PATHS_FOUND=`echo ${BINARY_PATHS_FOUND} | sed 's/^, //g' | sed 's/ //g'`
logtext "Discovered directories: ${SCANNEDPATHS}" logtext "Discovered directories: ${BINARY_PATHS_FOUND}"
report "binary_paths=${BINARY_PATHS_FOUND}"
BINARY_SCAN_FINISHED=1 BINARY_SCAN_FINISHED=1
#fi #fi