bench.sh

@@ -62,7 +62,7 @@ speed_test() {
     if [ $? -eq 0 ]; then
         local dl_speed=$(awk '/Download/{print $3" "$4}' ./speedtest-cli/speedtest.log)
         local up_speed=$(awk '/Upload/{print $3" "$4}' ./speedtest-cli/speedtest.log)
-        local latency=$(awk '/Latency/{print $3" "$4}' ./speedtest-cli/speedtest.log)
+        local latency=$(awk '/Latency/{print $2" "$3}' ./speedtest-cli/speedtest.log)
         if [[ -n "${dl_speed}" && -n "${up_speed}" && -n "${latency}" ]]; then
             printf "\033[0;33m%-18s\033[0;32m%-18s\033[0;31m%-20s\033[0;36m%-12s\033[0m\n" " ${nodeName}" "${up_speed}" "${dl_speed}" "${latency}"
         fi
@@ -77,11 +77,11 @@ speed() {
     speed_test '24215' 'Paris, FR'
     speed_test '28922' 'Amsterdam, NL'
     speed_test '24447' 'Shanghai, CN'
-    speed_test '5530' 'Chongqing, CN'
+    speed_test '26352' 'Nanjing, CN'
-    speed_test '60572' 'Guangzhou, CN'
+    speed_test '27594' 'Guangzhou, CN'
     speed_test '32155' 'Hongkong, CN'
-    speed_test '23647' 'Mumbai, IN'
+    speed_test '6527'  'Seoul, KR'
-    speed_test '13623' 'Singapore, SG'
+    speed_test '7311'  'Singapore, SG'
     speed_test '21569' 'Tokyo, JP'
 }
 
@@ -213,8 +213,8 @@ install_speedtest() {
             sys_bit="armel"
         fi
         [ -z "${sys_bit}" ] && _red "Error: Unsupported system architecture (${sysarch}).\n" && exit 1
-        url1="https://install.speedtest.net/app/cli/ookla-speedtest-1.2.0-linux-${sys_bit}.tgz"
+        url1="https://install.speedtest.net/app/cli/ookla-speedtest-1.1.1-linux-${sys_bit}.tgz"
-        url2="https://dl.lamp.sh/files/ookla-speedtest-1.2.0-linux-${sys_bit}.tgz"
+        url2="https://dl.lamp.sh/files/ookla-speedtest-1.1.1-linux-${sys_bit}.tgz"
         wget --no-check-certificate -q -T10 -O speedtest.tgz ${url1}
         if [ $? -ne 0 ]; then
             wget --no-check-certificate -q -T10 -O speedtest.tgz ${url2}
@@ -228,7 +228,7 @@ install_speedtest() {
 
 print_intro() {
     echo "-------------------- A Bench.sh Script By Teddysun -------------------"
-    echo " Version            : $(_green v2023-10-15)"
+    echo " Version            : $(_green v2023-06-10)"
     echo " Usage              : $(_red "wget -qO- bench.sh | bash")"
 }
 
@@ -240,37 +240,19 @@ get_system_info() {
     ccache=$( awk -F: '/cache size/ {cache=$2} END {print cache}' /proc/cpuinfo | sed 's/^[ \t]*//;s/[ \t]*$//' )
     cpu_aes=$( grep -i 'aes' /proc/cpuinfo )
     cpu_virt=$( grep -Ei 'vmx|svm' /proc/cpuinfo )
-    tram=$(
+    tram=$( LANG=C; free | awk '/Mem/ {print $2}' )
-        LANG=C
-        free | awk '/Mem/ {print $2}'
-    )
     tram=$( calc_size $tram )
-    uram=$(
+    uram=$( LANG=C; free | awk '/Mem/ {print $3}' )
-        LANG=C
-        free | awk '/Mem/ {print $3}'
-    )
     uram=$( calc_size $uram )
-    swap=$(
+    swap=$( LANG=C; free | awk '/Swap/ {print $2}' )
-        LANG=C
-        free | awk '/Swap/ {print $2}'
-    )
     swap=$( calc_size $swap )
-    uswap=$(
+    uswap=$( LANG=C; free | awk '/Swap/ {print $3}' )
-        LANG=C
-        free | awk '/Swap/ {print $3}'
-    )
     uswap=$( calc_size $uswap )
     up=$( awk '{a=$1/86400;b=($1%86400)/3600;c=($1%3600)/60} {printf("%d days, %d hour %d min\n",a,b,c)}' /proc/uptime )
     if _exists "w"; then
-        load=$(
+        load=$( LANG=C; w | head -1 | awk -F'load average:' '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//' )
-            LANG=C
-            w | head -1 | awk -F'load average:' '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'
-        )
     elif _exists "uptime"; then
-        load=$(
+        load=$( LANG=C; uptime | head -1 | awk -F'load average:' '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//' )
-            LANG=C
-            uptime | head -1 | awk -F'load average:' '{print $2}' | sed 's/^[ \t]*//;s/[ \t]*$//'
-        )
     fi
     opsy=$( get_opsy )
     arch=$( uname -m )
@@ -280,15 +262,9 @@ get_system_info() {
         echo ${arch} | grep -q "64" && lbit="64" || lbit="32"
     fi
     kern=$( uname -r )
-    disk_total_size=$(
+    disk_total_size=$( LANG=C; df -t simfs -t ext2 -t ext3 -t ext4 -t btrfs -t xfs -t vfat -t ntfs -t swap --total 2>/dev/null | grep total | awk '{ print $2 }' )
-        LANG=C
-        df -t simfs -t ext2 -t ext3 -t ext4 -t btrfs -t xfs -t vfat -t ntfs -t swap --total 2>/dev/null | grep total | awk '{ print $2 }'
-    )
     disk_total_size=$( calc_size $disk_total_size )
-    disk_used_size=$(
+    disk_used_size=$( LANG=C; df -t simfs -t ext2 -t ext3 -t ext4 -t btrfs -t xfs -t vfat -t ntfs -t swap --total 2>/dev/null | grep total | awk '{ print $3 }' )
-        LANG=C
-        df -t simfs -t ext2 -t ext3 -t ext4 -t btrfs -t xfs -t vfat -t ntfs -t swap --total 2>/dev/null | grep total | awk '{ print $3 }'
-    )
     disk_used_size=$( calc_size $disk_used_size )
     tcpctrl=$( sysctl net.ipv4.tcp_congestion_control | awk -F ' ' '{print $3}' )
 }
@@ -346,11 +322,11 @@ print_io_test() {
         io3=$( io_test ${writemb} )
         echo " I/O Speed(3rd run) : $(_yellow "$io3")"
         ioraw1=$( echo $io1 | awk 'NR==1 {print $1}' )
-        [ "$(echo $io1 | awk 'NR==1 {print $2}')" == "GB/s" ] && ioraw1=$(awk 'BEGIN{print '$ioraw1' * 1024}')
+        [ "`echo $io1 | awk 'NR==1 {print $2}'`" == "GB/s" ] && ioraw1=$( awk 'BEGIN{print '$ioraw1' * 1024}' )
         ioraw2=$( echo $io2 | awk 'NR==1 {print $1}' )
-        [ "$(echo $io2 | awk 'NR==1 {print $2}')" == "GB/s" ] && ioraw2=$(awk 'BEGIN{print '$ioraw2' * 1024}')
+        [ "`echo $io2 | awk 'NR==1 {print $2}'`" == "GB/s" ] && ioraw2=$( awk 'BEGIN{print '$ioraw2' * 1024}' )
         ioraw3=$( echo $io3 | awk 'NR==1 {print $1}' )
-        [ "$(echo $io3 | awk 'NR==1 {print $2}')" == "GB/s" ] && ioraw3=$(awk 'BEGIN{print '$ioraw3' * 1024}')
+        [ "`echo $io3 | awk 'NR==1 {print $2}'`" == "GB/s" ] && ioraw3=$( awk 'BEGIN{print '$ioraw3' * 1024}' )
         ioall=$( awk 'BEGIN{print '$ioraw1' + '$ioraw2' + '$ioraw3'}' )
         ioavg=$( awk 'BEGIN{printf "%.1f", '$ioall' / 3}' )
         echo " I/O Speed(average) : $(_yellow "$ioavg MB/s")"