From 2bc7c302dfaa3944f98a690574dd880dc59054c7 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Wed, 6 Dec 2023 20:37:09 -0600 Subject: [PATCH] Update status.inc --- inc/status.inc | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/inc/status.inc b/inc/status.inc index c2df0741..ae7bf828 100755 --- a/inc/status.inc +++ b/inc/status.inc @@ -143,23 +143,27 @@ STATUS(){ for NTYPE in "${ntypesel[@]}"; do STATUS_NODE ${NTYPE} > ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running & done - + nc_count=0; completed=false until [ "${completed}" == "true" ]; do for nodestatus in ${STATUSRUN_TMPFOLDER}/status-check.*.done; do - echo "H: ${nodestatus}" + NTS=$(grep -oP '(?<=status-check.).*?(?=.done)' <<< "${nodestatus}") + echo -e "$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.running)" + rm -f ${STATUSRUN_TMPFOLDER}/status-check.${NTS}.done + (($nc_count++)) done + [ ${nc_count} -eq ${#ntypesel[@]} ] && completed=true done - for NTYPE in "${ntypesel[@]}"; do - completed=false - until [ "${completed}" == "true" ]; do - if [ -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done ]; then - completed=true - # echo -e "$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running)" - fi - done - done + # for NTYPE in "${ntypesel[@]}"; do + # completed=false + # until [ "${completed}" == "true" ]; do + # if [ -f ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.done ]; then + # completed=true + # echo -e "$(cat ${STATUSRUN_TMPFOLDER}/status-check.${NTYPE}.running)" + # fi + # done + # done fi