vim/konata
4
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge kil and mil into div

Browse Source
This commit is contained in:
Michael De Roover 2021-04-26 17:18:16 +02:00
parent 15127acb2f
commit 7ce581042a
Signed by: vim
GPG Key ID: 075496E232CE04CB
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
konata.sh
View File

@ -120,21 +120,27 @@ cv(){
mapfile -t vac <<< $(jq -cr ".[] | select(.country==\"${cv[1]}\") | .data[-1] | .[]" < $vacf) mapfile -t vac <<< $(jq -cr ".[] | select(.country==\"${cv[1]}\") | .data[-1] | .[]" < $vacf)
pct(){ echo $(bc <<< "scale = 2; $1 * $2 / $3")%; } pct(){ echo $(bc <<< "scale = 2; $1 * $2 / $3")%; }
mil(){ echo $(bc <<< "scale = 3; $1 / 1000000")M; } div(){
kil(){ echo $(bc <<< "scale = 2; $1 / 1000")k; } if [ "$1" -gt "1000000" ]
then
echo $(bc <<< "scale = 3; $1 / 1000000")M
else
echo $(bc <<< "scale = 2; $1 / 1000")k
fi
}
sendmsg "<b>Today's COVID-19 stats for ${cv[1]}:</b> sendmsg "<b>Today's COVID-19 stats for ${cv[1]}:</b>
<b>Cases:</b> ${cv[4]} <b>Cases:</b> ${cv[4]}
<b>Active:</b> $(kil ${cv[9]}) <b>Active:</b> $(div ${cv[9]})
<b>Deaths:</b> ${cv[6]} <b>Deaths:</b> ${cv[6]}
($(kil ${cv[5]}) t, $(pct 100 ${cv[5]} ${cv[3]}) c, $(pct 100 ${cv[5]} ${cv[15]}) p) ($(div ${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>Total:</b> $(div ${cv[3]}) ($(pct 1 ${cv[11]} 10000))
<b>Tests:</b> $(mil ${cv[13]}) ($(pct 1 ${cv[14]} 10000)) <b>Tests:</b> $(div ${cv[13]}) ($(pct 1 ${cv[14]} 10000))
<b>Population:</b> $(mil ${cv[15]}) <b>Population:</b> $(div ${cv[15]})
<b>Vaccination stats:</b> <b>Vaccination stats:</b>
<b>Total people:</b> $(mil ${vac[2]}) <b>Total people:</b> $(div ${vac[2]})
<b>Fully vaccinated:</b> $(kil ${vac[3]}) <b>Fully vaccinated:</b> $(div ${vac[3]})
<b>Last update:</b> ${vac[0]} <b>Last update:</b> ${vac[0]}
Queried at $(date +'%Y-%m-%d %H:%M %Z'). Queried at $(date +'%Y-%m-%d %H:%M %Z').