diff --git a/bot.sh b/bot.sh index 40df031..5e3bc7b 100755 --- a/bot.sh +++ b/bot.sh @@ -62,32 +62,34 @@ ookla_bytes_sent_mb=$(echo "scale=2; $ookla_bytes_sent / 1048576" | bc) ookla_total=$(echo $ookla_bytes_sent_mb+$ookla_bytes_received_mb | bc) -echo Starting LibreSpeed -librespeed-cli --json > $speedtest_libre +#echo Starting LibreSpeed +#librespeed-cli --json > $speedtest_libre # Parsing JSON data -libre_bytes_sent=$(jq '.[0].bytes_sent' "$speedtest_libre") -libre_bytes_received=$(jq '.[0].bytes_received' "$speedtest_libre") -libre_ping=$(jq '.[0].ping' "$speedtest_libre") -libre_upload=$(jq '.[0].upload' "$speedtest_libre") -libre_download=$(jq '.[0].download' "$speedtest_libre") -libre_server_name=$(jq -r '.[0].server.name' "$speedtest_libre") +#libre_bytes_sent=$(jq '.[0].bytes_sent' "$speedtest_libre") +#libre_bytes_received=$(jq '.[0].bytes_received' "$speedtest_libre") +#libre_ping=$(jq '.[0].ping' "$speedtest_libre") +#libre_upload=$(jq '.[0].upload' "$speedtest_libre") +#libre_download=$(jq '.[0].download' "$speedtest_libre") +#libre_server_name=$(jq -r '.[0].server.name' "$speedtest_libre") # Converting to human readable units -libre_bytes_sent_mb=$(echo "scale=2; $libre_bytes_sent / 1048576" | bc) -libre_bytes_received_mb=$(echo "scale=2; $libre_bytes_received / 1048576" | bc) +#libre_bytes_sent_mb=$(echo "scale=2; $libre_bytes_sent / 1048576" | bc) +#libre_bytes_received_mb=$(echo "scale=2; $libre_bytes_received / 1048576" | bc) -libre_total=$(echo $libre_bytes_sent_mb+$libre_bytes_received_mb | bc) +#libre_total=$(echo $libre_bytes_sent_mb+$libre_bytes_received_mb | bc) -echo Starting Fast -fast --upload --json > $speedtest_fast -fast_download_speed=$(jq '.downloadSpeed' "$speedtest_fast") -fast_upload_speed=$(jq '.uploadSpeed' "$speedtest_fast") -fast_latency=$(jq '.latency' "$speedtest_fast") -fast_downloaded=$(jq '.downloaded' "$speedtest_fast") -fast_uploaded=$(jq '.uploaded' "$speedtest_fast") +#echo Starting Fast +#fast --upload --json > $speedtest_fast +#fast_download_speed=$(jq '.downloadSpeed' "$speedtest_fast") +#fast_upload_speed=$(jq '.uploadSpeed' "$speedtest_fast") +#fast_latency=$(jq '.latency' "$speedtest_fast") +#fast_downloaded=$(jq '.downloaded' "$speedtest_fast") +#fast_uploaded=$(jq '.uploaded' "$speedtest_fast") -fast_total=$(echo $fast_downloaded+$fast_uploaded | bc) +#fast_total=$(echo $fast_downloaded+$fast_uploaded | bc) + +total_wasted=$(echo $ookla_total+$libre_total+$fast_total | bc) echo Speedtests complete ################################################################################# @@ -119,8 +121,6 @@ echo Weather checked ################################################################################# ################################################################################# -total_wasted=$(echo $ookla_total+$libre_total+$fast_total | bc) - caption=" $current_weather