diff --git a/konata.sh b/konata.sh index f0450fe..281c679 100755 --- a/konata.sh +++ b/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 "Today's COVID-19 stats for ${cv[1]}: Cases: ${cv[4]} - Active: $(kil ${cv[9]})k + Active: $(kil ${cv[9]}) Deaths: ${cv[6]} - ($(kil ${cv[5]})k t, $(pct 100 ${cv[5]} ${cv[3]})% c, $(pct 100 ${cv[5]} ${cv[15]})% p) - Total: $(kil ${cv[3]})k ($(pct 1 ${cv[11]} 10000)%) - Tests: $(mil ${cv[13]})M ($(pct 1 ${cv[14]} 10000)%) - Population: $(mil ${cv[15]})M + ($(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]}) Vaccination stats: - Total people: ${vac[2]} - Fully vaccinated: ${vac[3]} + Total people: $(mil ${vac[2]}) + Fully vaccinated: $(kil ${vac[3]}) Last update: ${vac[0]} Queried at $(date +'%Y-%m-%d %H:%M %Z').