diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2016-09-08 22:04:17 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2016-09-08 22:04:17 +0300 |
| commit | 82ededed318e6adcc97d2495237d3c3b6c09cd04 (patch) | |
| tree | 7dcd3b4f1e8b25335b3c128972fb0be473fc5fa4 /include/tests_scheduling | |
| parent | 81d8486cb07d2d68aa71c52df363bb70aa226f4d (diff) | |
Style improvements and command replacements
Diffstat (limited to 'include/tests_scheduling')
| -rw-r--r-- | include/tests_scheduling | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/tests_scheduling b/include/tests_scheduling index 9bc9f10f..60270917 100644 --- a/include/tests_scheduling +++ b/include/tests_scheduling @@ -55,7 +55,7 @@ BAD_FILE_PERMISSIONS=0 BAD_FILE_OWNERSHIP=0 FindCronJob() { - sCRONJOBS=$(${EGREPBINARY} '^([0-9*])' $1 | tr '\t' ' ' | tr -s ' ' | tr ' ' ',') + sCRONJOBS=$(${EGREPBINARY} '^([0-9*])' $1 | ${TRBINARY} '\t' ' ' | ${TRBINARY} -s ' ' | ${TRBINARY} ' ' ',') } CRONTAB_FILE="/etc/crontab" @@ -155,7 +155,7 @@ if [ "${OS}" = "Linux" ]; then if [ -f /etc/anacrontab ]; then LogText "Test: checking anacrontab" - sANACRONJOBS=$(${EGREPBINARY} '^([0-9@])' /etc/anacrontab | tr '\t' ' ' | tr -s ' ' | tr ' ' ',') + sANACRONJOBS=$(${EGREPBINARY} '^([0-9@])' /etc/anacrontab | ${TRBINARY} '\t' ' ' | ${TRBINARY} -s ' ' | ${TRBINARY} ' ' ',') if [ ! "${sANACRONJOBS}" = "" ]; then Report "scheduler[]=anacron" for J in ${sANACRONJOBS}; do @@ -273,11 +273,11 @@ Register --test-no SCHD-7724 --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Check at jobs" if [ ${SKIPTEST} -eq 0 ]; then LogText "Test: Check scheduled at jobs" - FIND=$(atq | ${GREPBINARY} -v "no files in queue" | ${AWKBINARY} '{gsub("\t"," ");print}' | sed 's/ /!space!/g') + FIND=$(atq | ${GREPBINARY} -v "no files in queue" | ${AWKBINARY} '{gsub("\t"," ");print}' | ${SEDBINARY} 's/ /!space!/g') if [ ! "${FIND}" = "" ]; then LogText "Result: found one or more jobs" for I in ${FIND}; do - VALUE=$(echo ${I} | sed 's/!space!/ /g') + VALUE=$(echo ${I} | ${SEDBINARY} 's/!space!/ /g') LogText "Found at job: ${VALUE}" done Display --indent 4 --text "- Checking at jobs" --result "${STATUS_FOUND}" --color GREEN |