Improve pct, kil, mil
This commit is contained in:
parent
fafacdf9dd
commit
15127acb2f
20
konata.sh
20
konata.sh
@ -119,22 +119,22 @@ cv(){
|
||||
fi
|
||||
mapfile -t vac <<< $(jq -cr ".[] | select(.country==\"${cv[1]}\") | .data[-1] | .[]" < $vacf)
|
||||
|
||||
pct(){ bc <<< "scale = 2; $1 * $2 / $3"; }
|
||||
mil(){ bc <<< "scale = 3; $1 / 1000000"; }
|
||||
kil(){ bc <<< "scale = 2; $1 / 1000"; }
|
||||
pct(){ echo $(bc <<< "scale = 2; $1 * $2 / $3")%; }
|
||||
mil(){ echo $(bc <<< "scale = 3; $1 / 1000000")M; }
|
||||
kil(){ echo $(bc <<< "scale = 2; $1 / 1000")k; }
|
||||
|
||||
sendmsg "<b>Today's COVID-19 stats for ${cv[1]}:</b>
|
||||
<b>Cases:</b> ${cv[4]}
|
||||
<b>Active:</b> $(kil ${cv[9]})k
|
||||
<b>Active:</b> $(kil ${cv[9]})
|
||||
<b>Deaths:</b> ${cv[6]}
|
||||
($(kil ${cv[5]})k t, $(pct 100 ${cv[5]} ${cv[3]})% c, $(pct 100 ${cv[5]} ${cv[15]})% p)
|
||||
<b>Total:</b> $(kil ${cv[3]})k ($(pct 1 ${cv[11]} 10000)%)
|
||||
<b>Tests:</b> $(mil ${cv[13]})M ($(pct 1 ${cv[14]} 10000)%)
|
||||
<b>Population:</b> $(mil ${cv[15]})M
|
||||
($(kil ${cv[5]}) t, $(pct 100 ${cv[5]} ${cv[3]}) c, $(pct 100 ${cv[5]} ${cv[15]}) p)
|
||||
<b>Total:</b> $(kil ${cv[3]}) ($(pct 1 ${cv[11]} 10000))
|
||||
<b>Tests:</b> $(mil ${cv[13]}) ($(pct 1 ${cv[14]} 10000))
|
||||
<b>Population:</b> $(mil ${cv[15]})
|
||||
|
||||
<b>Vaccination stats:</b>
|
||||
<b>Total people:</b> ${vac[2]}
|
||||
<b>Fully vaccinated:</b> ${vac[3]}
|
||||
<b>Total people:</b> $(mil ${vac[2]})
|
||||
<b>Fully vaccinated:</b> $(kil ${vac[3]})
|
||||
<b>Last update:</b> ${vac[0]}
|
||||
|
||||
Queried at $(date +'%Y-%m-%d %H:%M %Z').
|
||||
|
Loading…
x
Reference in New Issue
Block a user