Skip to content

Commit 84778ff

Browse files
committed
wget to /tmp
1 parent 2d6f3ab commit 84778ff

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

superbench.sh

+11-9
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ next() {
8383

8484
speed_test(){
8585
if [[ $1 == '' ]]; then
86-
temp=$(python speedtest.py --share 2>&1)
86+
temp=$(python /tmp/speedtest.py --share 2>&1)
8787
is_down=$(echo "$temp" | grep 'Download')
8888
if [[ ${is_down} ]]; then
8989
local REDownload=$(echo "$temp" | awk -F ':' '/Download/{print $2}')
@@ -96,7 +96,7 @@ speed_test(){
9696
local cerror="ERROR"
9797
fi
9898
else
99-
temp=$(python speedtest.py --server $1 --share 2>&1)
99+
temp=$(python /tmp/speedtest.py --server $1 --share 2>&1)
100100
is_down=$(echo "$temp" | grep 'Download')
101101
if [[ ${is_down} ]]; then
102102
local REDownload=$(echo "$temp" | awk -F ':' '/Download/{print $2}')
@@ -117,24 +117,26 @@ speed_test(){
117117

118118
speed() {
119119
# install speedtest
120-
if [ ! -e './speedtest.py' ]; then
121-
wget https://raw.github.com/sivel/speedtest-cli/master/speedtest.py > /dev/null 2>&1
120+
if [ ! -e '/tmp/speedtest.py' ]; then
121+
wget -P /tmp https://raw.github.com/sivel/speedtest-cli/master/speedtest.py > /dev/null 2>&1
122122
fi
123-
chmod a+rx speedtest.py
123+
chmod a+rx /tmp/speedtest.py
124124

125125
speed_test '' 'Normal Node'
126-
speed_test '4595' 'Zhengzhou CT'
127-
speed_test '5316' 'Nanjing CT'
126+
speed_test '4595' 'Zhengzhou CT'
127+
speed_test '7509' 'Kunming CT'
128128
speed_test '3633' 'Shanghai CT'
129129
speed_test '4624' 'Chengdu CT'
130+
speed_test '5017' 'Shenyang CU'
130131
speed_test '4863' "Xi'an CU"
131132
speed_test '5083' 'Shanghai CU'
132133
speed_test '5726' 'Chongqing CU'
133134
speed_test '5292' "Xi'an CM"
134-
speed_test '4665' 'Shanghai CM'
135+
speed_test '16314' 'Shandong CM'
136+
speed_test '6715' 'Ningbo CM'
135137
speed_test '4575' 'Chengdu CM'
136138

137-
rm -rf speedtest.py
139+
rm -rf /tmp/speedtest.py
138140
}
139141

140142

superspeed.sh

+6-7
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,9 @@ fi
339339

340340
# install speedtest
341341
if [ ! -e './speedtest.py' ]; then
342-
wget https://raw.github.com/sivel/speedtest-cli/master/speedtest.py > /dev/null 2>&1
342+
wget -P /tmp https://raw.github.com/sivel/speedtest-cli/master/speedtest.py > /dev/null 2>&1
343343
fi
344-
chmod a+rx speedtest.py
344+
chmod a+rx /tmp/speedtest.py
345345

346346
result() {
347347
download=`cat speed.log | awk -F ':' '/Download/{print $2}'`
@@ -358,7 +358,7 @@ result() {
358358
}
359359

360360
speed_test(){
361-
temp=$(python speedtest.py --server $1 --share 2>&1)
361+
temp=$(python /tmp/speedtest.py --server $1 --share 2>&1)
362362
is_down=$(echo "$temp" | grep 'Download')
363363
if [[ ${is_down} ]]; then
364364
local REDownload=$(echo "$temp" | awk -F ':' '/Download/{print $2}')
@@ -377,7 +377,7 @@ speed_test(){
377377
}
378378

379379
if [[ ${telecom} =~ ^[1-3]$ ]]; then
380-
python speedtest.py --server ${num} --share 2>/dev/null | tee speed.log 2>/dev/null
380+
python /tmp/speedtest.py --server ${num} --share 2>/dev/null | tee speed.log 2>/dev/null
381381
is_down=$(cat speed.log | grep 'Download')
382382

383383
if [[ ${is_down} ]]; then
@@ -391,7 +391,7 @@ if [[ ${telecom} =~ ^[1-3]$ ]]; then
391391
fi
392392

393393
if [[ ${telecom} == 4 ]]; then
394-
python speedtest.py | tee speed.log
394+
python /tmp/speedtest.py | tee speed.log
395395
result
396396
echo "本地测试完成!"
397397
rm -rf speedtest.py
@@ -403,8 +403,7 @@ if [[ ${telecom} == 5 ]]; then
403403
printf "%-14s%-18s%-20s%-12s\n" "Node Name" "Upload Speed" "Download Speed" "Latency"
404404
start=$(date +%s)
405405
speed_test '4595' '郑州电信'
406-
speed_test '5316' '南京电信'
407-
speed_test '5081' '深圳电信'
406+
speed_test '7509' '昆明电信'
408407
speed_test '3633' '上海电信'
409408
speed_test '4624' '成都电信'
410409
speed_test '5017' '沈阳联通'

0 commit comments

Comments
 (0)