diff --git a/bin/clashfm.tar.gz b/bin/clashfm.tar.gz index a68d616..66e92e6 100644 Binary files a/bin/clashfm.tar.gz and b/bin/clashfm.tar.gz differ diff --git a/scripts/start.sh b/scripts/start.sh index e86f24b..5476822 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -291,7 +291,9 @@ EOF done < $hosts_dir fi #合并文件 - cut -c 1- $tmpdir/set.yaml $tmpdir/hosts.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml + [ -f $clashdir/user.yaml ] && yaml_user=$clashdir/user.yaml + [ -f $clashdir/hosts.yaml ] && yaml_hosts=$clashdir/hosts.yaml + cut -c 1- $tmpdir/set.yaml $yaml_hosts $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml #插入自定义规则 sed -i "/#自定义规则/d" $tmpdir/config.yaml space=$(sed -n '/^rules/{n;p}' $tmpdir/proxy.yaml | grep -oE '^\ *') #获取空格数