From 44940d3496daacbace7d38fd498d8b55ef429c2f Mon Sep 17 00:00:00 2001 From: juewuy Date: Thu, 5 Nov 2020 22:14:14 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta16.8=20~=E4=BC=98=E5=8C=96=E4=BA=86ma?= =?UTF-8?q?c=E5=9C=B0=E5=9D=80=E5=AF=BC=E5=85=A5=E5=92=8C=E5=88=A0?= =?UTF-8?q?=E9=99=A4=EF=BC=8C=E7=8E=B0=E5=9C=A8=E4=B8=8D=E5=AE=8C=E5=85=A8?= =?UTF-8?q?=E4=BE=9D=E8=B5=96dhcp=E6=9C=8D=E5=8A=A1=20~=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E4=BA=86=E5=90=88=E5=B9=B6=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E5=BC=8F=EF=BC=8C=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E8=AE=BE=E5=A4=87=E6=8A=A5=E9=94=99=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/start.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/start.sh b/scripts/start.sh index 0b03a59..def589a 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -239,8 +239,7 @@ EOF ################################### [ -f $clashdir/user.yaml ] && yaml_user=$clashdir/user.yaml #合并文件 - sed -i "/^prox/i" $tmpdir/proxy.yaml #防止缺少换行符导致的报错 - cat $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml + cut -c 1- $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml #插入自定义规则 if [ -f $clashdir/rules.yaml ];then while read line;do