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" = "已启用" ] && {