From a12cdaf5b2e07de22453a99129de430cc4e0b689 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Mon, 31 Jan 2022 14:39:32 +0800
Subject: [PATCH] =?UTF-8?q?v1.5.0-=E9=A2=84=E8=A7=88=E7=89=88=20~=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E6=9C=80=E6=96=B01.9.0=E5=AE=98=E6=96=B9=E5=86=85?=
 =?UTF-8?q?=E6=A0=B8=E5=8F=8Apremium=E5=86=85=E6=A0=B8=20~meta=E6=A0=B8?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E8=87=B3dev=E5=88=86=E6=94=AF=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=B9=B6=E7=A7=BB=E9=99=A4=E4=BA=86geosite=E7=9A=84?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E4=B8=8B=E8=BD=BD=E5=8A=9F=E8=83=BD=20~?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=9C=80=E6=96=B0Geoip=E5=8F=8ACNIP=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=96=87=E4=BB=B6=20~=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E6=9C=80=E6=96=B0Dashboard=E9=9D=A2=E6=9D=BF=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=20~DNS=E8=A7=A3=E6=9E=90=E9=BB=98=E8=AE=A4=E4=B8=8D=E5=86=8D?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9BIPV6=E7=BB=93=E6=9E=9C=EF=BC=8C=E9=9C=80?=
 =?UTF-8?q?=E6=89=8B=E5=8A=A8=E5=BC=80=E5=90=AF=20~=E7=8E=B0=E5=9C=A8?=
 =?UTF-8?q?=E5=B0=86=E4=BB=8E=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=B8=AD?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=BF=90=E8=A1=8C=E6=A8=A1=E5=BC=8F=E8=80=8C?=
 =?UTF-8?q?=E4=B8=8D=E6=98=AF=E5=9B=BA=E5=AE=9A=E7=9A=84Rule=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=20~=E5=9C=A8=E7=BA=BF=E7=94=9F=E6=88=90=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9vless=E5=8D=8F=E8=AE=AE=E7=9A=84=E6=94=AF=E6=8C=81=20~?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=AF=B9vless=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E7=9A=84=E6=A3=80=E6=B5=8B=E6=9C=BA=E5=88=B6=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E4=BD=BF=E7=94=A8=E4=BD=93=E9=AA=8C=20~=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E4=BD=BF=E7=94=A8=E7=8E=AF=E5=A2=83=E5=8F=98=E9=87=8F?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E6=9C=AC=E6=9C=BA=E4=BB=A3=E7=90=86=E4=B8=8D?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8Dmeta?=
 =?UTF-8?q?=E5=86=85=E6=A0=B8=E7=89=88=E6=9C=AC=E5=8F=B7=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=83=85=E5=86=B5=E4=B8=8B=E4=B8=8B=E8=BD=BD?=
 =?UTF-8?q?=E5=87=BA=E9=94=99=E5=90=8E=E4=B8=8D=E4=BC=9A=E6=AD=A3=E5=B8=B8?=
 =?UTF-8?q?=E9=87=8D=E8=AF=95=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scripts/getdate.sh |  6 +++---
 scripts/start.sh   | 14 +++++++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index da7bfb3..6e8b64a 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -463,11 +463,11 @@ setcore(){
 	echo "2 clashpre：  支持Tun模式、混合模式"
 	echo "(高级预览版)  内存占用更高"
 	echo
-	echo "3 clash.net： 支持vless/xtls"
+	echo "3 clash.net： 支持部分vless协议"
 	echo "(.net定制版)  第三方定制内核"
 	echo
-	echo "4 clash.meta：支持vless/xtls"
-	echo "(meta定制版)  需要额外4M空间占用"
+	echo "4 clash.meta：支持大部分vless协议"
+	echo "(meta定制版)  第三方定制内核"
 	echo
 	echo "5 手动指定处理器架构"
 	echo -----------------------------------------------
diff --git a/scripts/start.sh b/scripts/start.sh
index a53de9a..1d2be64 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -135,7 +135,7 @@ EOF`
 	yaml=$clashdir/config.yaml
 	yamlnew=/tmp/clash_config_$USER.yaml
 	rm -rf $yamlnew
-	$0 webget $yamlnew $Https 0 0 0 1
+	$0 webget $yamlnew $Https
 	if [ "$?" = "1" ];then
 		if [ -z "$markhttp" ];then
 			echo -----------------------------------------------
@@ -190,8 +190,16 @@ EOF`
 			echo -----------------------------------------------
 			exit 1
 		fi
+		#检测vless协议
+		if [ -n "$(cat $yamlnew | grep -E 'vless')" ] && [ "$clashcore" = "clash" -o "$clashcore" = "clashpre" ];then
+			echo -----------------------------------------------
+			logger "检测到vless协议！将改为使用clash.meta核心启动！" 33
+			rm -rf $bindir/clash
+			setconfig clashcore clash.meta
+			echo -----------------------------------------------
+		fi
 		#检测是否存在高级版规则
-		if [ "$clashcore" = "clash" -a -n "$(cat $yamlnew | grep -E '^script:|proxy-providers|rule-providers|vless')" ];then
+		if [ "$clashcore" = "clash" -a -n "$(cat $yamlnew | grep -E '^script:|proxy-providers|rule-providers')" ];then
 			echo -----------------------------------------------
 			logger "检测到高级版核心专属规则！将改为使用clash.net核心启动！" 33
 			rm -rf $bindir/clash
@@ -832,7 +840,7 @@ webget)
 			[ "$6" = "skipceroff" ] && certificate='' || certificate='-k'
 			#[ -n "$7" ] && agent='-A "clash"'
 			result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
-			[ "$?" != "0" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
+			[ "$result" != "200" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
 		else
 			if wget --version > /dev/null 2>&1;then
 				[ "$4" = "echooff" ] && progress='-q' || progress='-q --show-progress'