xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.0beta16.8

Browse Source 
~优化了mac地址导入和删除，现在不完全依赖dhcp服务
~优化了合并配置文件的方式，修复部分设备报错的bug
This commit is contained in:
juewuy
2020-11-05 22:14:14 +08:00
parent 4bceb9af59
commit 44940d3496
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
scripts/start.sh
View File

@@ -239,8 +239,7 @@ EOF
################################### ###################################
[ -f $clashdir/user.yaml ] && yaml_user=$clashdir/user.yaml [ -f $clashdir/user.yaml ] && yaml_user=$clashdir/user.yaml
#合并文件 #合并文件
sed -i "/^prox/i" $tmpdir/proxy.yaml #防止缺少换行符导致的报错 cut -c 1- $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml
cat $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml
#插入自定义规则 #插入自定义规则
if [ -f $clashdir/rules.yaml ];then if [ -f $clashdir/rules.yaml ];then
while read line;do while read line;do