From 3832eec3a85c63cf7455a45f64dc0d1ac554e169 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Sun, 20 Jun 2021 21:43:41 +0800
Subject: [PATCH] =?UTF-8?q?v1.4.0-release=20~=E9=80=82=E9=85=8D=E7=A7=BB?=
 =?UTF-8?q?=E5=8A=A8ax18=E7=AD=89=E4=BD=8E=E7=89=88=E6=9C=AC=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E8=AE=BE=E5=A4=87=20~=E5=A2=9E=E5=8A=A0=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E5=85=AC=E7=BD=91=E8=AE=BF=E9=97=AEDashboard=E9=9D=A2?=
 =?UTF-8?q?=E6=9D=BF=E5=8F=8A=E6=B7=B7=E5=90=88=E4=BB=A3=E7=90=86=E7=AB=AF?=
 =?UTF-8?q?=E5=8F=A3=E5=8A=9F=E8=83=BD=20~=E5=A2=9E=E5=8A=A0clash=20-u?=
 =?UTF-8?q?=E5=8D=B8=E8=BD=BD=E5=91=BD=E4=BB=A4=20~=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9C=BA=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=87=BA=E9=94=99bug=20~=E5=B1=80=E5=9F=9F=E7=BD=91=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=BB=91=E7=99=BD=E5=90=8D=E5=8D=95=E6=8F=8F=E8=BF=B0?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=20~=E4=BF=AE=E5=A4=8D=E5=8A=A0=E5=AF=86DNS?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E9=85=8D=E7=BD=AE=E7=9A=84?=
 =?UTF-8?q?bug=20~=E7=89=88=E6=9C=AC=E5=8F=8A=E5=AE=89=E8=A3=85=E6=BA=90?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=E4=BC=98=E5=8C=96=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?HTTP=E4=B8=93=E5=B1=9E=E6=BA=90=EF=BC=88=E6=84=9F=E8=B0=A2?=
 =?UTF-8?q?=E9=85=B1=E7=B4=AB=E8=A1=A8=E5=90=8C=E5=AD=A6=E6=8F=90=E4=BE=9B?=
 =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=EF=BC=81=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/clash.sh   |  6 +++---
 scripts/getdate.sh | 28 ++++++++++++++++------------
 2 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/scripts/clash.sh b/scripts/clash.sh
index becac1a..5de4ba7 100644
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -306,11 +306,11 @@ setdns(){
 		echo -e "\033[33m已禁用内置DNS！！！\033[0m"
 		setdns
 	elif [ "$num" = 5 ]; then
-		source $clashdir/getdate.sh
-		webget /tmp/ssl_test https://baidu.com echooff rediron skipceroff
-		if [ "$result" != "200" ];then
+		$clashdir/start.sh webget /tmp/ssl_test https://www.baidu.com echooff rediron skipceroff
+		if [ "$？" = "1" ];then
 			echo -----------------------------------------------
 			echo -e "\033[31m当前设备缺少本地根证书，请先安装证书！\033[0m"
+			source $clashdir/getdate.sh
 			setcrt
 		else
 			dns_nameserver='https://223.5.5.5/dns-query, https://doh.pub/dns-query, tls://dns.rubyfish.cn:853'
diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index edfa6c3..99466b4 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -687,27 +687,31 @@ setserver(){
 		release_new=""
 	}
 	echo -----------------------------------------------
-	echo -e "\033[30;47m您可以在此处切换在线更新时使用的资源地址\033[0m"
-	echo -e "当前源：\033[4;32m$update_url\033[0m"
+	echo -e "\033[30;47m切换ShellClash版本及更新源地址\033[0m"
+	echo -e "当前源地址：\033[4;32m$update_url\033[0m"
 	echo -----------------------------------------------
-	echo -e " 1 Jsdelivr-CDN源(test版本)"
-	echo -e " 2 Jsdelivr-CDN源(release版本)"
-	echo -e " 3 Github源(test版本，需开启clash服务)"
-	echo -e " 5 自定义输入(请务必确保路径正确)"
-	echo -e " 6 切换版本(仅支持切换至release分支)"
+	echo -e " 1 \033[32m正式版\033[0m&Jsdelivr-CDN源(推荐)"
+	echo -e " 2 \033[36m测试版\033[0m&Jsdelivr-CDN源"
+	echo -e " 3 \033[36m测试版\033[0m&Github源(需开启clash服务）"
+	[ -z "$(curl -V 2>/dev/null)" ] && [ -n "$(wget -V 2>&1 | grep BusyBox)" ] && echo -e " 4 \033[33mHttp专用源\033[0m@Qust.me(感谢\033[32m酱紫表\033[0m提供及维护)"
+	echo -e " 5 自定义源地址(用于本地源或自建源)"
+	echo -e " 6 \033[31m版本回退\033[0m"
 	echo -e " 0 返回上级菜单"
 	read -p "请输入对应数字 > " num
 	if	[ -z "$num" ]; then 
 		errornum
 	elif [ "$num" = 1 ]; then
-		update_url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master'
+		update_url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash'
 		saveserver
 	elif [ "$num" = 2 ]; then
-		update_url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash'
+		update_url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master'
 		saveserver
 	elif [ "$num" = 3 ]; then
 		update_url='https://raw.githubusercontent.com/juewuy/ShellClash/master'
 		saveserver
+	elif [ "$num" = 4 ]; then
+		update_url='http://sc.qust.me'
+		saveserver
 	elif [ "$num" = 5 ]; then
 		echo -----------------------------------------------
 		read -p "请输入个人源路径 > " update_url
@@ -720,7 +724,7 @@ setserver(){
 	elif [ "$num" = 6 ]; then
 		echo -----------------------------------------------
 		$clashdir/start.sh webget /tmp/clashrelease https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master/bin/release_version echooff rediroff 2>/tmp/clashrelease
-		echo -e "\033[32m请选择想要更新至的版本：\033[0m"
+		echo -e "\033[31m请选择想要回退至的release版本：\033[0m"
 		cat /tmp/clashrelease | awk '{print " "NR" "$1}'
 		echo -e " 0 返回上级菜单"
 		read -p "请输入对应数字 > " num
@@ -736,7 +740,7 @@ setserver(){
 		fi
 		
 	elif [ "$num" = 9 ]; then
-		update_url='http://192.168.31.31:8080/ShellClash'
+		update_url='http://192.168.123.90:8080/ShellClash'
 	else
 		errornum
 	fi
@@ -770,7 +774,7 @@ update(){
 	echo -e " 5 安装/更新本地\033[33m根证书文件\033[0m"
 	echo -e " 6 查看\033[32mPAC\033[0m自动代理配置"
 	echo -----------------------------------------------
-	echo -e " 7 切换\033[36m安装源\033[0m地址"
+	echo -e " 7 切换\033[36m安装源\033[0m及\033[36m安装版本\033[0m"
 	echo -e " 8 鸣谢"
 	echo -e " 9 \033[31m卸载\033[34mShellClash\033[0m"
 	echo -e " 0 返回上级菜单"