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