From a6ee33004e14279add692ced2a77e68bbdea3a0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Wed, 20 Feb 2019 17:52:30 +0100 Subject: [PATCH] Closes #59 IS_MYSQLUTILS: Fixed wrong logic (#60) --- evocheck.sh | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index 163f869..36e6a6b 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -344,14 +344,20 @@ if [ -e /etc/debian_version ]; then MYSQL_ADMIN=${MYSQL_ADMIN:-mysqladmin} if is_installed mysql-server; then # You can configure MYSQL_ADMIN in evocheck.cf - grep -qs "$MYSQL_ADMIN" /root/.my.cnf && echo 'IS_MYSQLUTILS FAILED!' \ - && verbose 'mysqladmin missing in /root/.my.cnf' - - ( test -x /usr/bin/mytop || test -x /usr/local/bin/mytop ) \ - && echo 'IS_MYSQLUTILS FAILED!' && verbose 'mytop binary missing' - - grep -qs debian-sys-maint /root/.mytop || echo 'IS_MYSQLUTILS FAILED!' \ - && verbose 'debian-sys-maint missing in /root/.mytop' + if ! grep -qs "$MYSQL_ADMIN" /root/.my.cnf; then + echo 'IS_MYSQLUTILS FAILED!' + verbose 'mysqladmin missing in /root/.my.cnf' + fi + if ! test -x /usr/bin/mytop; then + if ! test -x /usr/local/bin/mytop; then + echo 'IS_MYSQLUTILS FAILED!' + verbose 'mytop binary missing' + fi + fi + if ! grep -qs debian-sys-maint /root/.mytop; then + echo 'IS_MYSQLUTILS FAILED!' + verbose 'debian-sys-maint missing in /root/.mytop' + fi fi fi