From 5fc78550f35f6733dc3a5bafff47412a0f3961cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20S?= Date: Fri, 18 Jan 2019 15:14:40 +0100 Subject: [PATCH] Better readability and verbose messages --- evocheck.sh | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/evocheck.sh b/evocheck.sh index ce5c008..9851b2a 100755 --- a/evocheck.sh +++ b/evocheck.sh @@ -332,9 +332,14 @@ 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 -q "$MYSQL_ADMIN" /root/.my.cnf || echo 'IS_MYSQLUTILS FAILED!' - ( test -x /usr/bin/mytop || test -x /usr/local/bin/mytop ) || echo 'IS_MYSQLUTILS FAILED!' - grep -q debian-sys-maint /root/.mytop || echo 'IS_MYSQLUTILS FAILED!' + 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' fi fi