From 15f7939da7dbdeb613164b4e4d327eaf1b94193a Mon Sep 17 00:00:00 2001 From: Ralph Ronnquist Date: Thu, 10 Dec 2020 12:36:51 +1100 Subject: [PATCH] corrected time logic older is less --- sss.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sss.sh b/sss.sh index cda1b1b..46facf9 100755 --- a/sss.sh +++ b/sss.sh @@ -34,9 +34,9 @@ YEARLY="$(date -d '-1 year' '+%Y-%m-%d %H:%M:%S')" MARK=( ) function marksnap() { if [[ "${MARK[0]}" == "$1" ]] && [[ "${MARK[1]}" = "$2" ]] ; then - chcp cp $DEV ${MARKYEAR[2]} + chcp cp $DEV ${MARK[2]} fi - MARK=( "$1" "$2" $3 ) + MARK=( "$1" "$2" "$3" ) } { flock 9 @@ -45,16 +45,16 @@ function marksnap() { lscp -s $DEV | while read CNO DATE TIME REST ; do TS="$DATE $TIME" [ "$CNO" = "CNO" ] && continue - if [[ "$TS" > "$YEARLY" ]] ; then + if [[ "$TS" < "$YEARLY" ]] ; then marksnap YEAR "${DATE:0:4}" $CNO - elif [[ "$TS" > "$MONTHLY" ]] ; then + elif [[ "$TS" < "$MONTHLY" ]] ; then marksnap MONTH "${DATE:5:2}" $CNO - elif [[ "$TS" > "$WEEKLY" ]] ; then + elif [[ "$TS" < "$WEEKLY" ]] ; then # For older than most recent week, keep last snapshot each week marksnap WEEK "$(( 7${DATE:8:2} / 7 - 100 ))" $CNO - elif [[ "$TS" > "$DAILY" ]] ; then + elif [[ "$TS" < "$DAILY" ]] ; then marksnap DAY "${DATE:8:2}" $CNO - elif [[ "$TS" > "$HOURLY" ]] ; then + elif [[ "$TS" < "$HOURLY" ]] ; then marksnap HOUR "${DATE:8:2}-${TIME:0:2}" $CNO else echo "$CNO $DATE $TIME within last hour" -- 2.39.2