From 0d7f43cc22d7942034c2c441f8568d3865dc715d Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Thu, 7 Feb 2019 17:11:58 -0600 Subject: [PATCH] update --- defaults.inc | 1 + nodemgmt-scripts.sh | 2 +- run.sh | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/defaults.inc b/defaults.inc index ea99ce12..6cf76a31 100755 --- a/defaults.inc +++ b/defaults.inc @@ -3,6 +3,7 @@ VERS='2.02072019' NODEHOSTS=10.5.10.51,10.5.10.52,10.5.10.53 NODESERVICES=mysql,nginx,gitea,haproxy,keepalived,maxscale +noheader=service,status-check,nightlyrenew,backup,report REPL_CHECKS= CERT_DAEMON='/usr/bin/certbot' FOLDER=/opt/idssys/nodemgmt diff --git a/nodemgmt-scripts.sh b/nodemgmt-scripts.sh index 11730763..1d01b556 100755 --- a/nodemgmt-scripts.sh +++ b/nodemgmt-scripts.sh @@ -1070,7 +1070,7 @@ GUI(){ done } if [ ${action-x} ]; then - if [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ] && [ "$1" != "backup" ]; then + if [[ "$1" != *"${noheader}"* ]] && [[ "$2" != *"${noheader}"* ]]; then DISP_HEADER fi case $action in diff --git a/run.sh b/run.sh index fb440700..5702524d 100755 --- a/run.sh +++ b/run.sh @@ -12,7 +12,8 @@ else fi source /opt/idssys/nodemgmt/defaults.inc -if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ] && [ "$1" != "backup" ] && [ "$2" != "report" ]; then +if [[ "$1" != *"${noheader}"* ]] && [[ "$2" != *"${noheader}"* ]]; then +#if [ "$1" != "service" ] && [ "$1" != "status-check" ] && [ "$1" != "nightlyrenew" ] && [ "$1" != "backup" ] && [ "$2" != "report" ]; then if [ "${1}" = "gui" ]; then DISP_HEADER fi