Updated speedtest servers output

This commit is contained in:
Yavuz Aydın 2021-04-15 17:41:45 +02:00
parent da8ca59bb6
commit 35902e7760
1 changed files with 12 additions and 43 deletions

View File

@ -132,7 +132,7 @@ then
awk -F: ' /cpu MHz/ {freq=$2} END {print freq " MHz"}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//'
printf 'RAM: '
free -h | awk 'NR==2 {print $2}'
if [ "$(swapon -s | wc -l)" -lt 2 ]
if [ "$(free | awk '/Swap/ {printf $2}')" -eq "0" ]
then
printf 'Swap: -\n'
else
@ -217,29 +217,12 @@ then
printf ' your IPv4: %s\n' "$(redact_ip "$ipv4")"
printf '\n'
printf ' Cachefly CDN: '
download_benchmark -4 http://cachefly.cachefly.net/100mb.test | \
Bps_to_MiBps
printf ' Snel.com (NL): '
download_benchmark -4 http://193.33.60.30/binfiles/100MB.bin | \
Bps_to_MiBps
printf ' Hetzner (DE): '
download_benchmark -4 http://speed.hetzner.de/100MB.bin | \
Bps_to_MiBps
printf ' Linode NJ (US): '
download_benchmark -4 http://speedtest.newark.linode.com/100MB-newark.bin | \
Bps_to_MiBps
printf ' Online.net (FR): '
download_benchmark -4 http://ping.online.net/100Mo.dat | \
Bps_to_MiBps
printf ' DigitalOcean (CA): '
download_benchmark -4 http://speedtest-tor1.digitalocean.com/100mb.test | \
Bps_to_MiBps
printf " %-30s %-10s\n" "Cachefly CDN" "$(download_benchmark -4 http://cachefly.cachefly.net/100mb.test | Bps_to_MiBps)"
printf " %-30s %-10s\n" "Snel.com (NL)" "$(download_benchmark -4 http://193.33.60.30/binfiles/100MB.bin | Bps_to_MiBps)"
printf " %-30s %-10s\n" "Hetzner (DE)" "$(download_benchmark -4 http://speed.hetzner.de/100MB.bin | Bps_to_MiBps)"
printf " %-30s %-10s\n" "Online.net (FR)" "$(download_benchmark -4 http://ping.online.net/100Mo.dat | Bps_to_MiBps)"
printf " %-30s %-10s\n" "Linode NJ (US)" "$(download_benchmark -4 http://speedtest.newark.linode.com/100MB-newark.bin | Bps_to_MiBps)"
printf " %-30s %-10s\n" "DigitalOcean (CA)" "$(download_benchmark -4 http://speedtest-tor1.digitalocean.com/100mb.test | Bps_to_MiBps)"
else
printf 'No IPv4 connectivity detected\n'
@ -254,25 +237,11 @@ then
printf ' your IPv6: %s\n' "$(redact_ip "$ipv6")"
printf '\n'
printf ' Snel.com (NL): '
download_benchmark -6 http://[2a00:7b80:3043:1000::30]/binfiles/100MB.bin | \
Bps_to_MiBps
printf ' Hetzner (DE): '
download_benchmark -6 http://speed.hetzner.de/100MB.bin | \
Bps_to_MiBps
printf ' Linode NJ (US): '
download_benchmark -6 http://speedtest.newark.linode.com/100MB-newark.bin | \
Bps_to_MiBps
printf ' Online.net (FR): '
download_benchmark -6 http://ping6.online.net/100Mo.dat | \
Bps_to_MiBps
printf ' DigitalOcean (CA): '
download_benchmark -6 http://speedtest-tor1.digitalocean.com/100mb.test | \
Bps_to_MiBps
printf " %-30s %-10s\n" "Snel.com (NL)" "$(download_benchmark -6 http://[2a00:7b80:3043:1000::30]/binfiles/100MB.bin | Bps_to_MiBps)"
printf " %-30s %-10s\n" "Hetzner (DE)" "$(download_benchmark -6 http://speed.hetzner.de/100MB.bin | Bps_to_MiBps)"
printf " %-30s %-10s\n" "Online.net (FR)" "$(download_benchmark -6 http://ping6.online.net/100Mo.dat | Bps_to_MiBps)"
printf " %-30s %-10s\n" "Linode NJ (US)" "$(download_benchmark -6 http://speedtest.newark.linode.com/100MB-newark.bin | Bps_to_MiBps)"
printf " %-30s %-10s\n" "DigitalOcean (CA)" "$(download_benchmark -6 http://speedtest-tor1.digitalocean.com/100mb.test | Bps_to_MiBps)"
else
printf 'No IPv6 connectivity detected\n'