diff --git a/eval.sh b/eval.sh index 1e08735..c5a59cf 100644 --- a/eval.sh +++ b/eval.sh @@ -1,18 +1,15 @@ #! /bin/bash +source functions.sh -function e { - echo -ne "${1}\t" -} -echo -ne "$(hostname -s)\t$(cat /etc/motd )\t" -if ( rpm -qa | grep -qE '^php-[57]' ) ; then e 0 ; else e 1 ; fi +pkgNotInstalled '^php-[57]' -if [ -f /etc/yum.repos.d/remi.repo ] ; then e 1 ; else e 0 ; fi +fileMustExist /etc/yum.repos.d/remi.repo if ( systemctl status php-fpm &>/dev/null || systemctl status php73-php-fpm &> /dev/null ) ; then e 1 ; else e 0 ; fi -if [ -f /var/www/html/version.php ] ; then e 1 ; else e 0 ; fi +fileMustExist /ar/www/html/version.php if ( curl localhost/version.php 2>/dev/null |grep -q 7.3 ) ; then e 1 ; else e 0 ; fi echo diff --git a/functions.sh b/functions.sh index 2f7147a..9d96991 100644 --- a/functions.sh +++ b/functions.sh @@ -1,5 +1,9 @@ #! /bin/bash +function e { + echo -ne "${1}\t" +} + #ok if given program returns given code # arg1: program to run # arg2: expected return code (default 0) @@ -124,6 +128,14 @@ function pkgInstalled { if ( grep -qi $1 $pkglist ) ; then echo -ne "1\t" ; else echo -ne "0\t" ; fi } +# Ok if given package is NOT installed +# arg1: pkg to check +function pkgNotInstalled { + pkglist=/tmp/pkg.list + test -f $pkglist || rpm -qa > $pkglist + if ( grep -qiE $1 $pkglist ) ; then echo -ne "0\t" ; else echo -ne "1\t" ; fi +} + # ok if given process is running # arg1: process to check function processIsRunning {