v0.8.0更新

~大幅度优化脚本UI及层级
~增加在线更新脚本功能
~增加在线更新、替换clash核心功能
~内置dns增加redir-host支持,解决了部分应用无法连接的bug
~优化了配置文件修饰途径,现在支持通过scp上传任意yaml配置文件
~增加了直接导入完整订阅链接的选项(待测试)
~增加了更多的订阅后端服务器
This commit is contained in:
juewuy
2020-08-06 18:11:00 +08:00
parent 487ec9a27e
commit 39246316ca
4 changed files with 45 additions and 6 deletions

Binary file not shown.

View File

@@ -78,9 +78,9 @@ status=`ps |grep -w 'clash -d'|grep -v grep|wc -l`
if [[ $status -gt 0 ]];then
echo -----------------------------------------------
echo -e "\033[32mclash服务已启动\033[0m"
echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理clash内置规则"
echo -e "可以使用\033[30;47m http://clash.razord.top \033[0m管理内置规则"
host=$(ubus call network.interface.lan status | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
echo -e "Host地址:\033[30;46m $host \033[0m端口:\033[30;46m 9999 \033[0m"
echo -e "Host地址:\033[36m $host \033[0m 端口:\033[36m 9999 \033[0m"
else
echo -----------------------------------------------
echo -e "\033[31mclash服务启动失败请检查配置文件\033[0m"

View File

@@ -6,8 +6,7 @@ USE_PROCD=1
START=99
getconfig(){
cpath=/etc/clash
ccfg=$cpath/mark
ccfg=$clashdir/mark
if [ ! -f "$ccfg" ]; then
echo mark文件不存在默认以Redir模式运行
cat >$ccfg<<EOF
@@ -15,12 +14,51 @@ cat >$ccfg<<EOF
EOF
redir_mod=redir模式
common_ports=未开启
dns_mod=redir-host
fi
source $ccfg #加载配置文件
#是否代理常用端口
if [ "$common_ports" = "已开启" ];then
ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 '
fi
#DNS模式
if [ "$common_ports" = "已开启" ];then
ports='-m multiport --dports 22,53,587,465,995,993,143,80,443 '
fi
}
modifyyaml(){
##########需要变更的配置###########
redir='redir-port: 7892'
external='external-controller: 0.0.0.0:9999'
if [ "$dns_mod" = "fake-ip" ];then
dns='dns: {enable: true, listen: 0.0.0.0:1053, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [tcp://1.0.0.1, 8.8.4.4]}'
else
dns='dns: {enable: true, listen: 0.0.0.0:1053, enhanced-mode: redir-host, nameserver: [114.114.114.114, 127.0.0.1:53], fallback: [1.0.0.1, 8.8.4.4]}'
fi
if [ "$redir_mod" = "Tun模式" ];then
tun='tun: {enable: true, stack: system}'
else
tun='tun: {enable: false}'
fi
exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
###################################
#预删除需要添加的项目
sed -i '/^redir-port:*/'d $clashdir/config.yaml
sed -i '/^external-controller:*/'d $clashdir/config.yaml
sed -i '/^dns:*/'d $clashdir/config.yaml
sed -i '/^tun:*/'d $clashdir/config.yaml
sed -i '/^experimental:*/'d $clashdir/config.yaml
#添加配置
sed -i "2a$redir" $clashdir/config.yaml
sed -i "6a$external" $clashdir/config.yaml
sed -i "7a$dns" $clashdir/config.yaml
sed -i "8a$tun" $clashdir/config.yaml
sed -i "9a$exper" $clashdir/config.yaml
if [ "$skip_cert" != "未开启" ];then
sed -i "10,99s/sni: \S*/\1skip-cert-verify: true}/" $clashdir/config.yaml #跳过trojan本地证书验证
sed -i '10,99s/}}/}, skip-cert-verify: true}/' $clashdir/config.yaml #跳过v2+ssl本地证书验证
fi
sed -i '/rules:/a \ - DOMAIN-SUFFIX,clash.razord.top,🎯 全球直连' $clashdir/config.yaml
}
mark_time(){
start_time=`date +%s`
@@ -63,12 +101,13 @@ stop_tun(){
}
start_service() {
getconfig
modifyyaml
#创建clash后台进程
procd_open_instance
procd_set_param respawn
procd_set_param stderr 1
procd_set_param stdout 1
procd_set_param command $cpath/clash -d $cpath
procd_set_param command $clashdir/clash -d $clashdir
procd_close_instance
#修改iptables规则使流量进入clash
if [[ "$redir_mod" = "Tun模式" ]];then

View File

@@ -51,7 +51,7 @@ read -p "是否更换后端地址后重试?[1/0] > " res
fi
server_link=$(($server_link + 1))
#echo $server_link
sed -i "5i\server_link=$server_link" $ccfg
sed -i "1i\server_link=$server_link" $ccfg
getyaml
fi
exit;