github/across
1
0
Fork 0
mirror of https://github.com/teddysun/across.git synced 2025-10-31 08:45:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update comments

Browse Source
This commit is contained in:
Teddysun
2023-06-11 10:00:13 +09:00
parent 2d9b17634a
commit 503de4c505
1 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bench.sh
View File

@@ -2,7 +2,7 @@
# #
# Description: A Bench Script by Teddysun # Description: A Bench Script by Teddysun
# #
# Copyright (C) 2015 - 2022 Teddysun <i@teddysun.com> # Copyright (C) 2015 - 2023 Teddysun <i@teddysun.com>
# Thanks: LookBack <admin@dwhd.org> # Thanks: LookBack <admin@dwhd.org>
# URL: https://teddysun.com/444.html # URL: https://teddysun.com/444.html
# https://github.com/teddysun/across/blob/master/bench.sh # https://github.com/teddysun/across/blob/master/bench.sh
@@ -39,7 +39,7 @@ _exists() {
} }
_exit() { _exit() {
_red "\nThe script has been terminated.\n" _red "\nThe script has been terminated. Cleaning up files...\n"
# clean up # clean up
rm -fr speedtest.tgz speedtest-cli benchtest_* rm -fr speedtest.tgz speedtest-cli benchtest_*
exit 1 exit 1
@@ -228,7 +228,7 @@ install_speedtest() {
print_intro() { print_intro() {
echo "-------------------- A Bench.sh Script By Teddysun -------------------" echo "-------------------- A Bench.sh Script By Teddysun -------------------"
echo " Version : $(_green v2022-06-01)" echo " Version : $(_green v2023-06-10)"
echo " Usage : $(_red "wget -qO- bench.sh | bash")" echo " Usage : $(_red "wget -qO- bench.sh | bash")"
} }
@@ -305,6 +305,7 @@ print_system_info() {
echo " Kernel : $(_blue "$kern")" echo " Kernel : $(_blue "$kern")"
echo " TCP CC : $(_yellow "$tcpctrl")" echo " TCP CC : $(_yellow "$tcpctrl")"
echo " Virtualization : $(_blue "$virt")" echo " Virtualization : $(_blue "$virt")"
echo " IPv4/IPv6 : $online"
} }
print_io_test() { print_io_test() {
@@ -350,6 +351,17 @@ print_end_time() {
! _exists "wget" && _red "Error: wget command not found.\n" && exit 1 ! _exists "wget" && _red "Error: wget command not found.\n" && exit 1
! _exists "free" && _red "Error: free command not found.\n" && exit 1 ! _exists "free" && _red "Error: free command not found.\n" && exit 1
# check for curl/wget
command -v curl >/dev/null 2>&1 && local_curl=true || unset local_curl
# test if the host has IPv4/IPv6 connectivity
[[ ! -z ${local_curl} ]] && ip_check_cmd="curl -s -m 4" || ip_check_cmd="wget -qO- -T 4"
ipv4_check=$((ping -4 -c 1 -W 4 ipv4.google.com >/dev/null 2>&1 && echo true) || ${ip_check_cmd} -4 icanhazip.com 2> /dev/null)
ipv6_check=$((ping -6 -c 1 -W 4 ipv6.google.com >/dev/null 2>&1 && echo true) || ${ip_check_cmd} -6 icanhazip.com 2> /dev/null)
if [[ -z "$ipv4_check" && -z "$ipv6_check" ]]; then
_yellow "Warning: Both IPv4 and IPv6 connectivity were not detected.\n"
fi
[[ -z "$ipv4_check" ]] && online="$(_red "Offline")" || online="$(_green "Online")"
[[ -z "$ipv6_check" ]] && online+=" / $(_red "Offline")" || online+=" / $(_green "Online")"
start_time=$(date +%s) start_time=$(date +%s)
get_system_info get_system_info
check_virt check_virt