From b3e6791bc8673b042e7772516be4de0fc10c0e92 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Sat, 19 Oct 2019 13:45:51 -0400 Subject: [PATCH] fix false positive conflink detection --- system-status | 3 +++ 1 file changed, 3 insertions(+) diff --git a/system-status b/system-status index d6db7c3..c58d9ce 100755 --- a/system-status +++ b/system-status @@ -64,6 +64,8 @@ write-status() { if [[ -e $f ]]; then now=$(date +%s) fsec=$(stat -c%Y $f) + # the / 60 makes it 0-59 seconds less strict, +1 makes sure we + # dont have any false positives. fmin=$(( (fsec - now ) / 60 + 1 )) fminplus=$(( fmin + 60*24 )) # Filesystem files get copied, so find any newer than the last run. @@ -78,6 +80,7 @@ write-status() { if grep -qxF $HOSTNAME $x; then all_dirs+=( ${x%.hosts} ); fi done + # just because i forget a lot, -mmin -NUM means files modified <= NUM minutes ago if (( $(date -d "$(git log --diff-filter=ACR --format=%aD -1)" +%s) > fsec )) || \ [[ $(find ${all_dirs[@]} -mmin $fmin -type f -print -quit 2>/dev/null) ]]; then v conflink newer git or newer filesystem files -- 2.30.2