From ca1851acd79a2355fdf784bbdf44fe5187c51874 Mon Sep 17 00:00:00 2001 From: David Schroeder Date: Sat, 14 Jun 2025 14:05:28 -0500 Subject: [PATCH] Update dsmon.sh --- dsmon.sh | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dsmon.sh b/dsmon.sh index 7e6165c..15fa184 100755 --- a/dsmon.sh +++ b/dsmon.sh @@ -161,7 +161,7 @@ CHECK(){ nc_count=0; lc_count=0; completed=false; scanstart=$(date +%s) until [ "${completed}" == "true" ]; do until [ $(ls /tmp/dscheck.*.done 2>/dev/null | wc -l) -gt 0 ]; do tmp=tmp; done - echo -e "\r\r\n" + echo -e "\r\r\033[2K\n\033[2K" for host in /tmp/dscheck.*.done; do NTS=$(grep -oP '(?<=dscheck\.).*?(?=\.done)' <<< "${host}") @@ -172,14 +172,13 @@ CHECK(){ [ "${1}" != "report" ] && printf "%s\n" "$(cat /tmp/dscheck.${NTS}.results)" rm -f /tmp/dscheck.${NTS}.* >/dev/null 2>&1 ((nc_count++)) - - if [ "${1}" != "report" ]; then - [ ${nc_count} -gt ${lc_count} ] && echo - printf "\r${idsCL[LightCyan]}Completed on %d of %d hosts %s${idsCL[Default]}" "${nc_count}" "${#hostnames_sort[@]}" $([[ "$nc_count" -lt "${#hostnames_sort[@]}" ]] && echo " ..." || echo "") - fi fi done + if [ "${1}" != "report" ]; then + [ ${nc_count} -gt ${lc_count} ] && echo + printf "\r${idsCL[LightCyan]}Completed on %d of %d hosts %s${idsCL[Default]}" "${nc_count}" "${#hostnames_sort[@]}" $([[ "$nc_count" -lt "${#hostnames_sort[@]}" ]] && echo " ..." || echo "") + fi if [ $(($(date +%s)-scanstart)) -gt 300 ]; then SENDNOTICE "DSmon Scan Stuck" "DSmon Check scan has been running for 10mins, klling all bash...." 1