解决版本是 i686 时找不到 speedtest 文件的问题

README.md

@@ -3,7 +3,7 @@
 
 ## 使用方法
 ```
-bash <(curl -Lso- https://git.io/superspeed)
+bash <(curl -Lso- https://git.io/superspeed_flyzy2005)
 ```
 
 ## 节点列表

superspeed.sh

@@ -35,10 +35,10 @@ checkpython() {
 	if  [ ! -e '/usr/bin/python' ]; then
 	        echo "正在安装 Python"
 	            if [ "${release}" == "centos" ]; then
-	            		yum update > /dev/null 2>&1
+	            		#yum update > /dev/null 2>&1
 	                    yum -y install python > /dev/null 2>&1
 	                else
-	                	apt-get update > /dev/null 2>&1
+	                	#apt-get update > /dev/null 2>&1
 	                    apt-get -y install python > /dev/null 2>&1
 	                fi
 
@@ -49,10 +49,10 @@ checkcurl() {
 	if  [ ! -e '/usr/bin/curl' ]; then
 	        echo "正在安装 Curl"
 	            if [ "${release}" == "centos" ]; then
-	                yum update > /dev/null 2>&1
+	                #yum update > /dev/null 2>&1
 	                yum -y install curl > /dev/null 2>&1
 	            else
-	                apt-get update > /dev/null 2>&1
+	                #apt-get update > /dev/null 2>&1
 	                apt-get -y install curl > /dev/null 2>&1
 	            fi
 	fi
@@ -62,10 +62,10 @@ checkwget() {
 	if  [ ! -e '/usr/bin/wget' ]; then
 	        echo "正在安装 Wget"
 	            if [ "${release}" == "centos" ]; then
-	                yum update > /dev/null 2>&1
+	                #yum update > /dev/null 2>&1
 	                yum -y install wget > /dev/null 2>&1
 	            else
-	                apt-get update > /dev/null 2>&1
+	                #apt-get update > /dev/null 2>&1
 	                apt-get -y install wget > /dev/null 2>&1
 	            fi
 	fi
@@ -74,7 +74,12 @@ checkwget() {
 checkspeedtest() {
 	if  [ ! -e './speedtest-cli/speedtest' ]; then
 		echo "正在安装 Speedtest-cli"
-		wget --no-check-certificate -qO speedtest.tgz https://bintray.com/ookla/download/download_file?file_path=ookla-speedtest-1.0.0-$(uname -m)-linux.tgz > /dev/null 2>&1
+                arch=$(uname -m)
+                if [ "${arch}" == "i686" ]; then
+                    arch="i386"
+                fi
+		wget --no-check-certificate -qO speedtest.tgz https://cdn.jsdelivr.net/gh/oooldking/script@1.1.7/speedtest_cli/ookla-speedtest-1.0.0-${arch}-linux.tgz > /dev/null 2>&1
+		# wget --no-check-certificate -qO speedtest.tgz https://bintray.com/ookla/download/download_file?file_path=ookla-speedtest-1.0.0-${arch}-linux.tgz > /dev/null 2>&1
 	fi
 	mkdir -p speedtest-cli && tar zxvf speedtest.tgz -C ./speedtest-cli/ > /dev/null 2>&1 && chmod a+rx ./speedtest-cli/speedtest
 }
@@ -116,10 +121,11 @@ preinfo() {
 
 selecttest() {
 	echo -e "  测速类型:    ${GREEN}1.${PLAIN} 三网测速    ${GREEN}2.${PLAIN} 取消测速"
-	echo -ne "               ${GREEN}3.${PLAIN} 电信节点    ${GREEN}4.${PLAIN} 联通节点    ${GREEN}5.${PLAIN} 移动节点"
+	echo -e "               ${GREEN}3.${PLAIN} 电信节点    ${GREEN}4.${PLAIN} 联通节点    ${GREEN}5.${PLAIN} 移动节点"
+	echo -ne "               ${GREEN}6.${PLAIN} 详细三网测速"
 	while :; do echo
 			read -p "  请输入数字选择测速类型: " selection
-			if [[ ! $selection =~ ^[1-5]$ ]]; then
+			if [[ ! $selection =~ ^[1-6]$ ]]; then
 					echo -ne "  ${RED}输入错误${PLAIN}, 请输入正确的数字!"
 			else
 					break   
@@ -178,54 +184,54 @@ runtest() {
 		# speed_test '31985' '重庆' '联通'
 		 speed_test '4863' '陕西西安' '联通'
 		#***
-		# speed_test '30154' '上海' '移动'
+		speed_test '30154' '上海' '移动'
 		# speed_test '25637' '上海５Ｇ' '移动'
 		# speed_test '26728' '云南昆明' '移动'
-		# speed_test '27019' '内蒙古呼和浩特' '移动'
-		 speed_test '30232' '内蒙呼和浩特５Ｇ' '移动'
+		speed_test '27019' '内蒙古呼和浩特' '移动'
+		 # speed_test '30232' '内蒙呼和浩特５Ｇ' '移动'
 		# speed_test '30293' '内蒙古通辽５Ｇ' '移动'
-		 speed_test '25858' '北京' '移动'
-		 speed_test '16375' '吉林长春' '移动'
-		# speed_test '24337' '四川成都' '移动'
+		 #speed_test '25858' '北京' '移动'
+		 #speed_test '16375' '吉林长春' '移动'
+		speed_test '24337' '四川成都' '移动'
 		 speed_test '17184' '天津５Ｇ' '移动'
-		# speed_test '26940' '宁夏银川' '移动'
+		speed_test '26940' '宁夏银川' '移动'
 		# speed_test '31815' '宁夏银川' '移动'
 		# speed_test '26404' '安徽合肥５Ｇ' '移动'
-		 speed_test '27151' '山东临沂５Ｇ' '移动'
+		 #speed_test '27151' '山东临沂５Ｇ' '移动'
 		# speed_test '25881' '山东济南５Ｇ' '移动'
 		# speed_test '27100' '山东青岛５Ｇ' '移动'
 		# speed_test '26501' '山西太原５Ｇ' '移动'
-		 speed_test '31520' '广东中山' '移动'
+		# speed_test '31520' '广东中山' '移动'
 		# speed_test '6611' '广东广州' '移动'
 		# speed_test '4515' '广东深圳' '移动'
-		# speed_test '15863' '广西南宁' '移动'
+		speed_test '15863' '广西南宁' '移动'
 		# speed_test '16858' '新疆乌鲁木齐' '移动'
-		 speed_test '26938' '新疆乌鲁木齐５Ｇ' '移动'
+		 #speed_test '26938' '新疆乌鲁木齐５Ｇ' '移动'
 		# speed_test '17227' '新疆和田' '移动'
 		# speed_test '17245' '新疆喀什' '移动'
 		# speed_test '17222' '新疆阿勒泰' '移动'
-		# speed_test '27249' '江苏南京５Ｇ' '移动'
-		# speed_test '21845' '江苏常州５Ｇ' '移动'
+		speed_test '27249' '江苏南京５Ｇ' '移动'
+		speed_test '21845' '江苏常州５Ｇ' '移动'
 		# speed_test '26850' '江苏无锡５Ｇ' '移动'
 		# speed_test '17320' '江苏镇江５Ｇ' '移动'
-		 speed_test '25883' '江西南昌５Ｇ' '移动'
-		# speed_test '17223' '河北石家庄' '移动'
-		# speed_test '26331' '河南郑州５Ｇ' '移动'
+		 #speed_test '25883' '江西南昌５Ｇ' '移动'
+		 speed_test '17223' '河北石家庄' '移动'
+		 speed_test '26331' '河南郑州５Ｇ' '移动'
 		# speed_test '6715' '浙江宁波５Ｇ' '移动'
 		# speed_test '4647' '浙江杭州' '移动'
 		# speed_test '16503' '海南海口' '移动'
 		# speed_test '28491' '湖南长沙５Ｇ' '移动'
 		# speed_test '16145' '甘肃兰州' '移动'
-		 speed_test '16171' '福建福州' '移动'
-		# speed_test '18444' '西藏拉萨' '移动'
-		 speed_test '16398' '贵州贵阳' '移动'
-		 speed_test '25728' '辽宁大连' '移动'
+		 #speed_test '16171' '福建福州' '移动'
+		speed_test '18444' '西藏拉萨' '移动'
+		speed_test '16398' '贵州贵阳' '移动'
+		 #speed_test '25728' '辽宁大连' '移动'
 		# speed_test '16167' '辽宁沈阳' '移动'
 		# speed_test '17584' '重庆' '移动'
-		# speed_test '26380' '陕西西安' '移动'
+		speed_test '26380' '陕西西安' '移动'
 		# speed_test '29105' '陕西西安５Ｇ' '移动'
-		# speed_test '29083' '青海西宁５Ｇ' '移动'
-		# speed_test '26656' '黑龙江哈尔滨' '移动'
+		speed_test '29083' '青海西宁５Ｇ' '移动'
+		speed_test '26656' '黑龙江哈尔滨' '移动'
 
 		end=$(date +%s)  
 		rm -rf speedtest*
@@ -239,7 +245,7 @@ runtest() {
 			echo -ne "  测试完成, 本次测速耗时: ${time} 秒"
 		fi
 		echo -ne "\n  当前时间: "
-		echo $(date +%Y-%m-%d" "%H:%M:%S)
+		echo $(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)
 		echo -e "  ${GREEN}# 三网测速中为避免节点数不均及测试过久，每部分未使用所${PLAIN}"
 		echo -e "  ${GREEN}# 有节点，如果需要使用全部节点，可分别选择三网节点检测${PLAIN}"
 	fi
@@ -280,7 +286,7 @@ runtest() {
 			echo -ne "  测试完成, 本次测速耗时: ${time} 秒"
 		fi
 		echo -ne "\n  当前时间: "
-		echo $(date +%Y-%m-%d" "%H:%M:%S)
+		echo $(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)
 	fi
 
 	if [[ ${selection} == 4 ]]; then
@@ -324,7 +330,7 @@ runtest() {
 			echo -ne "  测试完成, 本次测速耗时: ${time} 秒"
 		fi
 		echo -ne "\n  当前时间: "
-		echo $(date +%Y-%m-%d" "%H:%M:%S)
+		echo $(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)
 	fi
 
 	if [[ ${selection} == 5 ]]; then
@@ -393,7 +399,125 @@ runtest() {
 			echo -ne "  测试完成, 本次测速耗时: ${time} 秒"
 		fi
 		echo -ne "\n  当前时间: "
-		echo $(date +%Y-%m-%d" "%H:%M:%S)
+		echo $(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)
+	fi
+
+	if [[ ${selection} == 6 ]]; then
+		echo "——————————————————————————————————————————————————————————"
+		echo "ID    测速服务器信息       上传/Mbps   下载/Mbps   延迟/ms"
+		start=$(date +%s) 
+
+		 speed_test '3633' '上海' '电信'
+		 speed_test '24012' '内蒙古呼和浩特' '电信'
+		 speed_test '27377' '北京５Ｇ' '电信'
+		 speed_test '29026' '四川成都' '电信'
+		 speed_test '29071' '四川成都' '电信'
+		 speed_test '17145' '安徽合肥５Ｇ' '电信'
+		 speed_test '27594' '广东广州５Ｇ' '电信'
+		 speed_test '27810' '广西南宁' '电信'
+		 speed_test '27575' '新疆乌鲁木齐' '电信'
+		 speed_test '26352' '江苏南京５Ｇ' '电信'
+		 speed_test '5396' '江苏苏州５Ｇ' '电信'
+		 speed_test '5317' '江苏连云港５Ｇ' '电信'
+		 speed_test '7509' '浙江杭州' '电信'
+		 speed_test '23844' '湖北武汉' '电信'
+		 speed_test '29353' '湖北武汉５Ｇ' '电信'
+		 speed_test '28225' '湖南长沙５Ｇ' '电信'
+		 speed_test '3973' '甘肃兰州' '电信'
+		 speed_test '19076' '重庆' '电信'
+		#***
+		speed_test '21005' '上海' '联通'
+		 speed_test '24447' '上海５Ｇ' '联通'
+		 speed_test '5103' '云南昆明' '联通'
+		 speed_test '5145' '北京' '联通'
+		 speed_test '5505' '北京' '联通'
+		 speed_test '9484' '吉林长春' '联通'
+		 speed_test '2461' '四川成都' '联通'
+		 speed_test '27154' '天津５Ｇ' '联通'
+		 speed_test '5509' '宁夏银川' '联通'
+		 speed_test '5724' '安徽合肥' '联通'
+		 speed_test '5039' '山东济南' '联通'
+		 speed_test '26180' '山东济南５Ｇ' '联通'
+		 speed_test '26678' '广东广州５Ｇ' '联通'
+		 speed_test '16192' '广东深圳' '联通'
+		 speed_test '6144' '新疆乌鲁木齐' '联通'
+		 speed_test '13704' '江苏南京' '联通'
+		 speed_test '5485' '湖北武汉' '联通'
+		 speed_test '26677' '湖南株洲' '联通'
+		 speed_test '4870' '湖南长沙' '联通'
+		 speed_test '4690' '甘肃兰州' '联通'
+		 speed_test '4884' '福建福州' '联通'
+		 speed_test '31985' '重庆' '联通'
+		 speed_test '4863' '陕西西安' '联通'
+		 #新增
+		 speed_test '45170' '江苏无锡' '联通'
+		 speed_test '36646' '河南郑州' '联通'
+		 speed_test '24447' '上海' '联通'
+		#***
+		speed_test '30154' '上海' '移动'
+		 speed_test '25637' '上海５Ｇ' '移动'
+		 speed_test '26728' '云南昆明' '移动'
+		 speed_test '27019' '内蒙古呼和浩特' '移动'
+		 speed_test '30232' '内蒙呼和浩特５Ｇ' '移动'
+		 speed_test '30293' '内蒙古通辽５Ｇ' '移动'
+		 speed_test '25858' '北京' '移动'
+		 speed_test '16375' '吉林长春' '移动'
+		 speed_test '24337' '四川成都' '移动'
+		 speed_test '17184' '天津５Ｇ' '移动'
+		 speed_test '26940' '宁夏银川' '移动'
+		 speed_test '31815' '宁夏银川' '移动'
+		 speed_test '26404' '安徽合肥５Ｇ' '移动'
+		 speed_test '27151' '山东临沂５Ｇ' '移动'
+		 speed_test '25881' '山东济南５Ｇ' '移动'
+		 speed_test '27100' '山东青岛５Ｇ' '移动'
+		 speed_test '26501' '山西太原５Ｇ' '移动'
+		 speed_test '31520' '广东中山' '移动'
+		 speed_test '6611' '广东广州' '移动'
+		 speed_test '4515' '广东深圳' '移动'
+		 speed_test '15863' '广西南宁' '移动'
+		 speed_test '16858' '新疆乌鲁木齐' '移动'
+		 speed_test '26938' '新疆乌鲁木齐５Ｇ' '移动'
+		 speed_test '17227' '新疆和田' '移动'
+		 speed_test '17245' '新疆喀什' '移动'
+		 speed_test '17222' '新疆阿勒泰' '移动'
+		 speed_test '27249' '江苏南京５Ｇ' '移动'
+		 speed_test '21845' '江苏常州５Ｇ' '移动'
+		 speed_test '26850' '江苏无锡５Ｇ' '移动'
+		 speed_test '17320' '江苏镇江５Ｇ' '移动'
+		 speed_test '25883' '江西南昌５Ｇ' '移动'
+		 speed_test '17223' '河北石家庄' '移动'
+		 speed_test '26331' '河南郑州５Ｇ' '移动'
+		 speed_test '6715' '浙江宁波５Ｇ' '移动'
+		 speed_test '4647' '浙江杭州' '移动'
+		 speed_test '16503' '海南海口' '移动'
+		 speed_test '28491' '湖南长沙５Ｇ' '移动'
+		 speed_test '16145' '甘肃兰州' '移动'
+		 speed_test '16171' '福建福州' '移动'
+		 speed_test '18444' '西藏拉萨' '移动'
+		 speed_test '16398' '贵州贵阳' '移动'
+		 speed_test '25728' '辽宁大连' '移动'
+		 speed_test '16167' '辽宁沈阳' '移动'
+		 speed_test '17584' '重庆' '移动'
+		 speed_test '26380' '陕西西安' '移动'
+		 speed_test '29105' '陕西西安５Ｇ' '移动'
+		 speed_test '29083' '青海西宁５Ｇ' '移动'
+		 speed_test '26656' '黑龙江哈尔滨' '移动'
+
+		end=$(date +%s)  
+		rm -rf speedtest*
+		echo "——————————————————————————————————————————————————————————"
+		time=$(( $end - $start ))
+		if [[ $time -gt 60 ]]; then
+			min=$(expr $time / 60)
+			sec=$(expr $time % 60)
+			echo -ne "  测试完成, 本次测速耗时: ${min} 分 ${sec} 秒"
+		else
+			echo -ne "  测试完成, 本次测速耗时: ${time} 秒"
+		fi
+		echo -ne "\n  当前时间: "
+		echo $(TZ=UTC-8 date +%Y-%m-%d" "%H:%M:%S)
+		echo -e "  ${GREEN}# 三网测速中为避免节点数不均及测试过久，每部分未使用所${PLAIN}"
+		echo -e "  ${GREEN}# 有节点，如果需要使用全部节点，可分别选择三网节点检测${PLAIN}"
 	fi
 }