From 0cdc5e548a62a53ef0881d7f5e1f4e7553e63c69 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 25 Oct 2023 19:00:43 -0500 Subject: [PATCH] update --- defaults.inc | 2 +- inc/status.inc | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/defaults.inc b/defaults.inc index 5f741f37..7d14acc6 100755 --- a/defaults.inc +++ b/defaults.inc @@ -1,5 +1,5 @@ #!/usr/bin/env bash -VERS='4.12.41-10222023' +VERS='4.12.42-10252023' noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update ' CERT_DAEMON='/snap/bin/certbot' diff --git a/inc/status.inc b/inc/status.inc index 25c9743f..874b5f56 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -1,6 +1,9 @@ #!/usr/bin/env bash STATUS(){ start=`date +%s` + + cw=40; + ST_ACTION=${1} if [ "${ST_ACTION}" = "sync" ]; then ST_ACTION=repl @@ -58,7 +61,7 @@ STATUS(){ for srvc in "${LOCAL_SERVICES[@]}"; do if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "report" ]; then - c=0; cw=30; spc='' + c=0; spc='' spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]} until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done else @@ -180,7 +183,7 @@ STATUS(){ if [ ${NOGOCHK} == true ]; then if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "report" ]; then - c=0; cw=30; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + c=0; cw=40; spc=''; spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done else spc=' ' fi @@ -245,7 +248,7 @@ STATUS(){ # if [ ${NOGOCHK} = true ]; then # if [ "${ST_ACTION}" != "check" ]; then # if [ "${ST_ACTION}" != "report" ]; then - # c=0; cw=30; spc='' + # c=0; cw=40; spc='' # spc1=${cw}-${#NM_SERVICE_DESC[${srvc}]} # until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done # else @@ -338,7 +341,7 @@ STATUS(){ if [ ${NOGOCHK} == true ]; then if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "report" ]; then - c=0; cw=30; spc='' + c=0; spc='' spc1=`expr ${cw} - ${#NM_DOCKER_DESC[${docker}]}` until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done else @@ -486,7 +489,7 @@ STATUS(){ for rcheck in "${!var2}"; do if [ "${ST_ACTION}" != "check" ]; then if [ "${ST_ACTION}" != "report" ]; then - c=0; cw=30; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done + c=0; spc=''; spc1=${cw}-${#NM_REPL_DESC[${rcheck}]}; until [ $c = ${spc1} ]; do spc="${spc} "; c=`expr $c + 1`; done else spc=' ' fi