From 6a97329e948f01ac37c81df69e08dbc469238c74 Mon Sep 17 00:00:00 2001
From: juewuy <juewuy@126.com>
Date: Thu, 23 Mar 2023 19:22:27 +0800
Subject: [PATCH] =?UTF-8?q?v1.7.3b=20~=E5=9C=A8=E7=BA=BF=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E4=BC=98=E5=8C=96=20~?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A6=81=E7=94=A8=E8=B7=B3=E8=BF=87=E8=AF=81?=
 =?UTF-8?q?=E4=B9=A6=E5=8A=9F=E8=83=BD=E6=97=A0=E6=B3=95=E7=94=9F=E6=95=88?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/scripts/getdate.sh b/scripts/getdate.sh
index 5da1554..9b1b059 100644
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -138,7 +138,7 @@ getlink(){
 		link=`echo ${link/\ \(*\)/''}`   #删除恶心的超链接内容
 		link=`echo ${link/*\&url\=/""}`   #将clash完整链接还原成单一链接
 		link=`echo ${link/\&config\=*/""}`   #将clash完整链接还原成单一链接
-		link=`echo ${link//\&/\%26}`   #将分隔符 & 替换成urlcode：%26
+		link=`echo ${link//\&/\\\&}`   #处理分隔符
 		if [ -n "$test" ];then
 			if [ -z "$Url_link" ];then
 				Url_link="$link"
@@ -208,6 +208,7 @@ getlink2(){
 				#将用户链接写入mark
 				sed -i '/Url=*/'d $ccfg
 				setconfig Https \'$link\'
+				setconfig Url
 				#获取在线yaml文件
 				getyaml
 			else
diff --git a/scripts/start.sh b/scripts/start.sh
index 4ef1078..090593c 100644
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -176,7 +176,6 @@ https://github.com/juewuy/ShellClash/raw/master/rules/ACL4SSR_Online_Games.ini
 https://github.com/juewuy/ShellClash/raw/master/rules/ACL4SSR_Online_Mini_Games.ini
 https://github.com/juewuy/ShellClash/raw/master/rules/ACL4SSR_Online_Full_Games.ini
 EOF`
-	Https=$(echo ${Https//\%26/\&})   #将%26替换回&
 	#如果传来的是Url链接则合成Https链接，否则直接使用Https链接
 	if [ -z "$Https" -a -z "$retry" ];then
 		[ -n "$(echo $Url | grep -oE 'vless:')" ] && Server='https://api.v1.mk'
@@ -348,7 +347,8 @@ modify_yaml(){
 		sed -n "${yaml_r}p" $yaml >> $tmpdir/proxy.yaml #将rule字段附在末尾
 	fi
 	#跳过本地tls证书验证
-	[ "$skip_cert" = "已开启" ] && sed -i 's/skip-cert-verify: false/skip-cert-verify: true/' $tmpdir/proxy.yaml
+	[ "$skip_cert" = "已开启" ] && sed -i 's/skip-cert-verify: false/skip-cert-verify: true/' $tmpdir/proxy.yaml || \
+		sed -i 's/skip-cert-verify: true/skip-cert-verify: false/' $tmpdir/proxy.yaml
 	#节点绕过功能支持
 	sed -i "/#节点绕过/d" $tmpdir/rule.yaml
 	[ "$proxies_bypass" = "已启用" ] && {