From c8e5ef3e7d82812c19e86766cf25d0cafe4d015c Mon Sep 17 00:00:00 2001
From: David Schroeder <david@schroedercity.com>
Date: Sat, 2 Dec 2023 17:26:00 -0600
Subject: [PATCH] update

---
 defaults.inc   | 2 +-
 inc/status.inc | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/defaults.inc b/defaults.inc
index 79c62f5a..b3d7caf6 100755
--- a/defaults.inc
+++ b/defaults.inc
@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-VERS='4.16.21-12022023'
+VERS='4.16.22-12022023'
 
 noheader=' service status-check nightlyrephp7.3-fpm,new backup report check checkcerts gitea update-nodes copynpmcerts singleservercheck update-dyndns backup-offsitepfsense gui nightlyreview update log '
 CERT_DAEMON='/snap/bin/certbot'
diff --git a/inc/status.inc b/inc/status.inc
index f2d51f8b..a1f6878d 100755
--- a/inc/status.inc
+++ b/inc/status.inc
@@ -40,6 +40,7 @@ STATUS(){
 						${PH_CMD} rm -f ${NM_FOLDER}/test.repl
 						daterun=`date +%Y-%m-%d-%H-%M-%S`
 						${PH_CMD} "echo -e \"Status-Check (${NODE_HOSTNAME})\n${daterun}\" > ${NM_REPL_CHECK_LOC[${rcheck}]}/test.repl" &
+						${PH_CMD} find ${NM_REPL_CHECK_LOC[${rcheck}]} -iname "*.sync-conflict-*" -exec rm {} \;
 					done
 				fi
 			fi
@@ -540,16 +541,20 @@ It was down for $(SHOW_TIME ${toterrtime})"
 										fi
 										rm -f ${NM_TMPFOLDER}/${nip}~${rcheck}.repl*
 									fi
-								fi				
+									ssh -q root@${nip} find ${NM_REPL_CHECK_LOC[${rcheck}]} -iname "*.sync-conflict-*" -exec rm {} \;
+								fi			
 							done
+														
 						else
 							if [ "${ST_ACTION}" != "check" ]; then
 								[ -f ${NM_FOLDER}/${!PH}.down ] && echo -e "${idsCL[Red]}${NM_HOSTNAMES[${!PH}]} (${!PH}) is offline${idsCL[Default]}"
 								[ -f ${NM_TMPFOLDER}/${nip}.down ] && echo -e "${idsCL[Red]}${NM_HOSTNAMES[${nip}]}[${nip}] is offline${idsCL[Default]}"
 							fi
 						fi
-						if [ "${ST_ACTION}" != "check" ]; then echo; fi
+						[ "${ST_ACTION}" != "check" ] && echo
+						
 					fi
+										
 				done
 			fi
 		done