From 3a85ac14990063d2cde69418cf06f415e93691b9 Mon Sep 17 00:00:00 2001 From: juewuy Date: Thu, 12 Nov 2020 14:20:01 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta17.1=20~=E4=BF=AE=E5=A4=8D=E9=83=A8?= =?UTF-8?q?=E5=88=86=E8=AE=BE=E5=A4=87=E6=97=A0=E6=B3=95=E4=BD=BF=E7=94=A8?= =?UTF-8?q?mac=E8=BF=87=E6=BB=A4=E7=9A=84bug=20~=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=A2=9E=E5=8A=A0PAC=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=8F=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/clash.sh | 5 +++-- scripts/getdate.sh | 10 +++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/scripts/clash.sh b/scripts/clash.sh index 1bb5038..a30c41e 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -358,6 +358,7 @@ macfilter(){ [ -f /var/lib/dhcp/dhcpd.leases ] && dhcpdir='/var/lib/dhcp/dhcpd.leases' [ -f /var/lib/dhcpd/dhcpd.leases ] && dhcpdir='/var/lib/dhcpd/dhcpd.leases' [ -f /tmp/dhcp.leases ] && dhcpdir='/tmp/dhcp.leases' + [ -f /tmp/dhcp.leases ] && dhcpdir='/dev/null' [ -z "$macfilter_type" ] && macfilter_type='黑名单' [ "$macfilter_type" = "黑名单" ] && macfilter_over='白名单' || macfilter_over='黑名单' ###### @@ -599,8 +600,8 @@ clashcfg(){ echo -e " 1 切换Clash运行模式: \033[36m$redir_mod\033[0m" echo -e " 2 切换DNS运行模式: \033[36m$dns_mod\033[0m" echo -e " 3 跳过本地证书验证: \033[36m$skip_cert\033[0m ————解决节点证书验证错误" - echo -e " 4 只代理常用端口: \033[36m$common_ports\033[0m ————用于屏蔽P2P流量" - echo -e " 5 过滤局域网mac地址: \033[36m$mac_return\033[0m ————当前为$macfilter_type模式" + echo -e " 4 只代理常用端口: \033[36m$common_ports\033[0m ————用于过滤P2P流量" + echo -e " 5 过滤局域网设备: \033[36m$mac_return\033[0m ————当前为$macfilter_type模式" echo -e " 6 设置本机代理服务: \033[36m$local_proxy\033[0m ————使用环境变量或GUI/api配置本机代理" echo ----------------------------------------------- echo -e " 9 \033[32m重启\033[0mclash服务" diff --git a/scripts/getdate.sh b/scripts/getdate.sh index e6e4cb7..d3e0465 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -758,6 +758,7 @@ update(){ echo -e " 2 切换\033[33mclash核心 \033[33m$clashv\033[0m > \033[32m$clash_n\033[0m" echo -e " 3 更新\033[32mGeoIP数据库 \033[33m$Geo_v\033[0m > \033[32m$GeoIP_v\033[0m" echo -e " 4 安装本地\033[35mDashboard\033[0m面板" + echo -e " 5 查看\033[32mPAC\033[0m自动代理配置" echo ----------------------------------------------- echo -e " 7 切换\033[36m安装源\033[0m地址" echo -e " 8 鸣谢" @@ -784,7 +785,14 @@ update(){ elif [ "$num" = 4 ]; then getdb update - + + elif [ "$num" = 5 ]; then + echo ----------------------------------------------- + echo -e "PAC配置链接为:\033[30;47m http://$host:$db_port/ui/pac \033[0m" + echo -e "PAC的使用教程请参考:\033[4;32mhttps://juewuy.github.io/ehRUeewcv\033[0m" + sleep 2 + update + elif [ "$num" = 7 ]; then setserver