Merge branch 'master' of gitlab.com:MrFry/mrfrys-node-server

This commit is contained in:
mrfry 2020-11-10 17:14:45 +01:00
commit 01440cf6db

View file

@ -87,17 +87,17 @@ pcolumns() {
}
function jsonStats() {
dateind=$(date '+%Y/%m/%d')
dateind=$(date '+%Y-%m-%d')
a=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort)
ac=$(cat "$1" | jq ".[\"$dateind\"] | length")
a="\t${ac}\n${a}"
dateind=$(date -d '-1 day' '+%Y/%m/%d')
dateind=$(date -d '-1 day' '+%Y-%m-%d')
b=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort)
bc=$(cat "$1" | jq ".[\"$dateind\"] | length")
b="\t${bc}\n${b}"
dateind=$(date -d '-2 day' '+%Y/%m/%d')
dateind=$(date -d '-2 day' '+%Y-%m-%d')
c=$(cat "$1" | jq ".[\"$dateind\"]" | grep -ve '^{' | grep -ve '}$' | grep -ve '^\s*}' | sort)
cc=$(cat "$1" | jq ".[\"$dateind\"] | length")
c="\t${cc}\n${c}"
@ -140,15 +140,15 @@ function jsonStats() {
}
function jsonStatsLength() {
dateind=$(date '+%Y/%m/%d')
dateind=$(date '+%Y-%m-%d')
ac=$(cat "$1" | jq ".[\"$dateind\"] | length")
a="\t${ac}\n"
dateind=$(date -d '-1 day' '+%Y/%m/%d')
dateind=$(date -d '-1 day' '+%Y-%m-%d')
bc=$(cat "$1" | jq ".[\"$dateind\"] | length")
b="\t${bc}\n"
dateind=$(date -d '-2 day' '+%Y/%m/%d')
dateind=$(date -d '-2 day' '+%Y-%m-%d')
cc=$(cat "$1" | jq ".[\"$dateind\"] | length")
c="\t${cc}\n"