diff --git a/.build/Dockerfile b/.build/Dockerfile index 752023f..12779e2 100644 --- a/.build/Dockerfile +++ b/.build/Dockerfile @@ -2,11 +2,14 @@ FROM archlinux WORKDIR /root +# update all +RUN pacman -Syu --noconfirm + # Basic -RUN pacman -Sy --noconfirm mpv jq curl bc +RUN pacman -S --noconfirm mpv jq curl bc # Ookla Speedtest -RUN pacman -Sy --noconfirm speedtest-cli +RUN pacman -S --noconfirm speedtest-cli # LibreSpeed RUN curl -LOJ https://github.com/librespeed/speedtest-cli/releases/download/v1.0.10/librespeed-cli_1.0.10_linux_amd64.tar.gz \ diff --git a/bot.sh b/bot.sh index 6430971..04249f1 100755 --- a/bot.sh +++ b/bot.sh @@ -49,7 +49,7 @@ echo Satellite Image grabbed ################################################################################# echo Doing speedtest by Ookla # Run speedtest and output to a file -#speedtest --json | tee $speedtest_ookla +speedtest --json | tee $speedtest_ookla # Extract information from the speedtest output # Parsing JSON data @@ -78,7 +78,7 @@ 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 | tee $speedtest_libre +librespeed-cli --json | tee $speedtest_libre # Parsing JSON data libre_bytes_sent=$(jq '.[0].bytes_sent' "$speedtest_libre") @@ -229,6 +229,18 @@ $current_weather 🌐 1.1.1.1 ping: $cfdns_ping ms 🌐 8.8.8.8 ping: $googledns_ping ms +*Speedtest by Ookla*: +🌐 *Server*: $ookla_server, $ookla_city, $ookla_country +🏓 *Latency*: $ookla_ping ms +⬇️ *Download*: $ookla_download_mbps Mbit/s, Used: $ookla_bytes_received_mb MB +⬆️ *Upload*: $ookla_upload_mbps Mbit/s, Used: $ookla_bytes_sent_mb MB + +*LibreSpeed*: +🌐 *Server*: $libre_server_name +🏓 *Latency*: $libre_ping ms +⬇️ *Download*: $libre_download Mbit/s, Used: $libre_bytes_received_mb MB +⬆️ *Upload*: $libre_upload Mbit/s, Used $libre_bytes_sent_mb MB + *Fast Powered by Netflix*: 🏓 *Latency*: $fast_latency ms ⬇️ *Download*: $fast_download_speed Mbit/s, Used: $fast_downloaded MB