v0.8.6

~新增CDN下载源和Github下载源，下载更新速度更快 ~新增了切换下载源的选项菜单 ~界面UI优化及bug修复
2020-08-10 20:24:28 +08:00
parent 022cd07935
commit 31865ff734
5 changed files with 200 additions and 147 deletions
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -26,23 +26,23 @@ if [ -z $Https ];then
 	markhttp=1
 fi
 #
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo 正在连接服务器获取配置文件…………链接地址为：
 echo -e "\033[4;32m$Https\033[0m"
 echo 可以手动复制该链接到浏览器打开并查看数据是否正常！
-echo -e "\033[36m-----------------------------------------------"
+echo -e "\033[36m~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 echo -e "|                                             |"
 echo -e "|         需要一点时间，请耐心等待！          |"
 echo -e "|       \033[0m如长时间没有数据请用ctrl+c退出\033[36m        |"
-echo -e "-----------------------------------------------\033[0m"
+echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\033[0m"
 #获取在线yaml文件
 yamlnew=$yaml.new
 rm -rf $yamlnew > /dev/null 2>&1
 result=$(curl -w %{http_code} -kLo $yamlnew $Https)
 if [ "$result" != "200" ];then
-	echo -----------------------------------------------
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo -e "\033[31m配置文件获取失败！\033[0m"
-	echo -----------------------------------------------
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo
 	if [ -z $markhttp ];then
 		exit;
@@ -73,7 +73,7 @@ else
 		sleep 1
 		status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
 		if [[ $status -gt 0 ]];then
-			echo -----------------------------------------------
+			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e "\033[32mclash服务已启动！\033[0m"
 			echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理clash内置规则"
 			host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
@@ -83,7 +83,7 @@ else
 			sed -i "7i\Https=\'$Https\'" $ccfg
 			clashsh
 		else
-			echo -----------------------------------------------
+			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			if [ -f $yaml.bak ];then
 				echo -e "\033[31mclash服务启动失败！已还原配置文件并重启clash！\033[0m"
 				mv $yaml.bak $yaml
@@ -95,13 +95,13 @@ else
 			fi
 		fi
 	else
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[33m获取到了配置文件，但格式似乎不对！\033[0m"
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		sed -n '1,20p' $yamlnew
 		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[33m请检查如上配置文件信息:\033[0m"
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	fi
 	exit;
 fi
@@ -110,17 +110,18 @@ exit
 getlink(){
 #设置输入循环
 i=1
-while [ $i -le 9 ]
+while [ $i -le 99 ]
 do
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo -e "\033[44m 遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
 	echo -----------------------------------------------
-	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+	echo -e "支持批量导入\033[30;46m Http/Https/Clash \033[0m等格式的订阅链接"
+	echo -e "支持批量导入\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0m等格式的节点链接"
+	echo -e "\033[31m使用SSR节点请务必使用支持SSR的clash核心！\033[0m"
+	echo -e "多个较短的链接可以用\033[30;47m | \033[0m分隔以一次性输入"
+	echo -e "多个较长的链接请尽量分多次输入，可支持多达\033[30;47m 99 \033[0;36m次输入"
+	echo -e "\033[32m直接输入回车以结束输入并开始导入链接！\033[0m"
 	echo -----------------------------------------------
-	echo -e "\033[33m支持批量导入\033[30;46m Http/Https/Clash \033[0;33m等格式的订阅链接"
-	echo -e "支持批量导入\033[30;42m Vmess/SSR/SS/Trojan/Sock5 \033[0;33m等格式的节点链接"
-	echo -e "\033[36m多个较短的链接可以用\033[30;47m | \033[0;36m分隔以一次性输入"
-	echo -e "多个较长的链接请尽量分多次输入，可支持多达\033[30;47m 9 \033[0;36m次输入"
-	echo -e "\033[31;47m注意SSR/SS不支持：\033[30;47mchacha20加密 \033[0m"
-	echo -e "\033[44;37m直接输入回车以结束输入并开始导入链接！\033[0m"
 	echo -e "\033[33m 0 返回上级目录！\033[0m"
 	echo -----------------------------------------------
 	read -p "请输入第"$i"个链接 > " url
@@ -138,7 +139,7 @@ do
 		i=$(($i+1))
 	elif [ -z $url ];then
 		if [ -n $Url ];then
-			echo -----------------------------------------------
+			echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 			echo -e 请检查输入的链接是否正确：
 			echo -e "\033[4m$Url\033[0m"
 			read -p "确认导入配置文件？原配置文件将被更名为config.yaml.bak![1/0] > " res
@@ -155,12 +156,12 @@ do
 	elif [[ $url == 0 ]];then
 		clashlink
 	else
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m请输入正确的订阅/分享链接！！！\033[0m"
 	fi
 done
 ####
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo 输入太多啦，可能会导致订阅失败！
 echo "多个较短的链接请尽量用“|”分隔以一次性输入！"
 echo -e "请检查输入的链接是否正确：\033[4m$Url\033[0m"
@@ -173,19 +174,20 @@ if [ "$res" = '1' ]; then
 	#获取在线yaml文件
 	getyaml
 else
-	echo -----------------------------------------------
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo 操作已取消！返回上级菜单！
 	clashlink
 fi
 	clashlink
 } 
 getlink2(){
-echo -----------------------------------------------
-echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[44m 遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
 echo -----------------------------------------------
 echo -e "\033[33m仅支持导入可直接在clash中使用的完整订阅链接"
 echo -e "\033[36m非完整链接请使用【导入节点/订阅链接】功能"
 echo -e "\033[31m注意如节点使用了chacha20加密协议，需将核心更新为clashr核心\033[0m"
+echo -----------------------------------------------
 echo -e "\033[33m0 返回上级目录！\033[0m"
 echo -----------------------------------------------
 read -p "请输入完整链接 > " Https
@@ -194,7 +196,7 @@ Https=`echo ${Https/\ \(*\)/''}`   #删除恶心的超链接内容
 #Https=`echo ${Https//\&/\%26}`   #将分隔符 & 替换成Httpscode：%26
 if [ -n $Https ];then
 	if [ -n $test ];then
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e 请检查输入的链接是否正确：
 		echo -e "\033[4m$Https\033[0m"
 		read -p "确认导入配置文件？原配置文件将被更名为config.yaml.bak![1/0] > " res
@@ -211,12 +213,12 @@ if [ -n $Https ];then
 elif [[ $Https == 0 ]];then
 	clashlink
 else
-	echo -----------------------------------------------
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo -e "\033[31m请输入正确的链接地址！！！\033[0m"
 fi
 }
 getsh(){
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "\033[33m正在检查更新！\033[0m"
 result=$(curl -w %{http_code} -skLo /tmp/clashversion $update_url/bin/version)
 [ "$result" != "200" ] && echo "检查更新失败！" && exit 1
@@ -268,10 +270,10 @@ fi

 cpucore=armv7
 clashcore_n=$clashcore
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "当前clash核心：\033[47;30m $clashcore \033[46;30m$clashv\033[0m"
 echo -e "\033[32m请选择需要下载的核心版本！\033[0m"
-echo
+echo -----------------------------------------------
 echo "1 clash：     运行稳定，内存占用小"
 echo "(官方正式版)  不支持SSR，不支持Tun模式"
 echo
@@ -280,11 +282,11 @@ echo "(clashR修改版)不支持Tun模式"
 echo
 echo "3 clashpre：  支持SSR，支持Tun模式"
 echo "(高级预览版)  内存占用高，不支持chacha20加密"
-echo
+echo -----------------------------------------------
 echo 0 返回上级菜单 
 read -p "请输入对应数字 > " num
 	if [ -z $num ]; then
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m请输入正确的数字！\033[0m"
 		update
 	elif [[ $num == 0 ]]; then
@@ -296,7 +298,7 @@ read -p "请输入对应数字 > " num
 	elif [[ $num == 3 ]]; then
 		clashcore=clashpre
 	else
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m请输入正确的数字！\033[0m"
 		update
 	fi
@@ -304,26 +306,26 @@ read -p "请输入对应数字 > " num
 corelink="$update_url/bin/$clashcore/clash-linux-$cpucore"
 versionlink="$update_url/bin/$clashcore/version"
 #检测版本
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "\033[33m正在检查更新！\033[0m"
 result=$(curl -w %{http_code} -skLo /tmp/clashversion $versionlink)
 [ "$result" != "200" ] && echo "检查更新失败！" && exit 1
 source /tmp/clashversion
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "当前clash核心：\033[0m $clashcore_n \033[33m$clashv\033[0m"
 echo -e "最新clash核心：\033[32m $clashcore \033[36m$version\033[0m"
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 read -p "是否更新？[1/0] > " res
 if [ "$res" = '1' ]; then
-	echo -----------------------------------------------
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo 正在连接服务器获取clash核心文件…………链接地址为：
 	echo -e "\033[4;32m$corelink\033[0m"
 	echo 如无法正常下载可以手动复制到浏览器下载核心文件！
-	echo -e "\033[36m-----------------------------------------------"
+	echo -e "\033[36m~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
 	echo -e "|                                             |"
 	echo -e "|         需要一点时间，请耐心等待！          |"
 	echo -e "|       \033[0m如长时间没有数据请用ctrl+c退出        |"
-	echo -e "-----------------------------------------------\033[0m"
+	echo -e "~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~\033[0m"
 	#获取在线clash核心文件
 	result=$(curl -w %{http_code} -kLo /tmp/clash.new $corelink)
 	if [ "$result" != "200" ];then
@@ -340,7 +342,7 @@ if [ "$res" = '1' ]; then
 		sed -i '/clashv=*/'d $ccfg
 		sed -i "1i\clashv=$version" $ccfg
 		rm -rf /tmp/clashversion
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[32m$clashcore核心替换成功，请手动启动clash服务！\033[0m"
 		clashsh
 	fi	
@@ -349,19 +351,23 @@ getcore
 fi			
 }
 getgeo(){
-echo -----------------------------------------------
-echo -e "\033[32m感谢Alecthw大神提供的优质GeoIP数据库！！！\033[0m"
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[30;46m感谢Alecthw大神提供的优质GeoIP数据库！！！\033[0m"
 echo -----------------------------------------------
 echo -e "\033[33m请选择下载源：\033[0m"
-echo -e " 1 我的个人服务器"
+echo -e " 1 默认源：$update_url"
 echo -e " 2 Alecthw大神提供的服务器"
 echo -e " 0 返回上级菜单"
 read -p "请输入对应数字 > " num
-	if [[ $num == 0 ]]; then
+	if	[ -z $num ]; then 
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+		echo -e "\033[31m请输入正确的数字！\033[0m"
+		update
+	elif [[ $num == 0 ]]; then
 		update
 	elif [[ $num == 1 ]]; then
 		geolink="$update_url/bin/Country.mmdb"
-		echo $geolink
+		#echo $geolink
 	elif [[ $num == 2 ]]; then
 		geolink="http://www.ideame.top/mmdb/Country.mmdb"
 	else
@@ -369,16 +375,16 @@ read -p "请输入对应数字 > " num
 		update
 		exit;
 	fi
-	echo -----------------------------------------------
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo 正在从服务器获取数据库文件…………
 	result=$(curl -w %{http_code} -kLo $clashdir/Country.mmdb $geolink)
 	if [ "$result" != "200" ];then
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m文件下载失败！\033[0m"
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		getgeo
 	else
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[32mGeoIP数据库文件下载成功！\033[0m"
 			update
 	fi
@@ -386,7 +392,7 @@ update
 }
 getdb(){
 host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
-echo -----------------------------------------------
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 echo -e "\033[36m安装本地版dashboard管理面板\033[0m"
 echo -----------------------------------------------
 echo -e "\033[32m打开管理面板的速度更快且更稳定"
@@ -396,9 +402,9 @@ echo -----------------------------------------------
 read -p "是否安装本地面板？[1/0] > " res
 if [ "$res" = '1' ]; then
 	if [ -d /www/clash ];then
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m检测到您已经安装过本地面板了！\033[0m"
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		read -p "是否覆盖安装？[1/0] > " res
 		if [ -z "$res" ]; then
 			update
@@ -409,13 +415,13 @@ if [ "$res" = '1' ]; then
 		fi
 	fi
 	dblink="$update_url/bin/clashdb.tar.gz"
-	echo -----------------------------------------------
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 	echo 正在连接服务器获取安装文件…………
 	result=$(curl -w %{http_code} -kLo /tmp/clashdb.tar.gz $dblink)
 	if [ "$result" != "200" ];then
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[31m文件下载失败！\033[0m"
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		getdb
 	else
 		echo -e "\033[33m下载成功，正在解压文件！\033[0m"
@@ -423,7 +429,7 @@ if [ "$res" = '1' ]; then
 		tar -zxvf '/tmp/clashdb.tar.gz' -C /www/clash > /dev/null
 		[ $? -ne 0 ] && echo "文件解压失败！" && exit 1 
 		echo -e "\033[32m面板安装成功！"
-		echo -----------------------------------------------
+		echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 		echo -e "\033[36m请使用\033[32;4mhttp://$host/clash\033[0;36m访问面板\033[0m"
 		rm -rf /tmp/clashdb.tar.gz
 		update
@@ -431,3 +437,42 @@ if [ "$res" = '1' ]; then
 fi		
 update
 }
+setserver(){
+
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[30;47m您可以在此处切换在线更新时使用的资源地址\033[0m"
+echo -e "当前源：\033[4;32m$update_url\033[0m"
+echo -----------------------------------------------
+echo -e " 1 CDN源(感谢\033[4;32mwww.jsdelivr.com\033[0m，推荐)"
+echo -e " 2 Github源(不稳定，不推荐)"
+echo -e " 3 Github源+clash代理(需开启clash服务，推荐)"
+echo -e " 4 自定义输入"
+echo -e " 0 返回上级菜单"
+read -p "请输入对应数字 > " num
+if	[ -z $num ]; then 
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+	update
+elif [[ $num == 1 ]]; then
+	update_url="https://cdn.jsdelivr.net/gh/juewuy/clash-for-Miwifi"
+elif [[ $num == 9 ]]; then
+	update_url="https://juewuy.xyz/clash"
+elif [[ $num == 2 ]]; then
+	update_url="https://raw.githubusercontent.com/juewuy/clash-for-Miwifi/master"
+elif [[ $num == 3 ]]; then
+	update_url="-x 127.0.0.1:7890 https://raw.githubusercontent.com/juewuy/clash-for-Miwifi/master"
+elif [[ $num == 4 ]]; then
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	read -p "请输入个人源路径 > " update_url
+else
+	echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	echo -e "\033[31m请输入正确的数字！\033[0m"
+	update
+fi
+#写入mark文件
+sed -i '/update_url*/'d $ccfg
+sed -i "1i\update_url=\'$update_url\'" $ccfg
+echo ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+echo -e "\033[32m源地址更新成功！\033[0m"
+update
+}