From cf7ff363e066c61eaad5a3b3ca6f22b40ad979ae Mon Sep 17 00:00:00 2001 From: juewuy Date: Thu, 17 Dec 2020 09:57:33 +0800 Subject: [PATCH] =?UTF-8?q?v1.0.0beta18=20~=E5=9B=9E=E9=80=80armv5?= =?UTF-8?q?=E6=A0=B8=E5=BF=83=E4=B8=BA=E6=9C=AA=E5=8E=8B=E7=BC=A9=E7=8A=B6?= =?UTF-8?q?=E6=80=81=20~=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E7=95=8C=E9=9D=A2=E5=B1=82=E7=BA=A7=E9=94=99=E4=B9=B1?= =?UTF-8?q?=E7=9A=84bug=20~=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4=E5=B1=80?= =?UTF-8?q?=E5=9F=9F=E7=BD=91=E8=AE=BE=E5=A4=87=E6=97=A0=E6=B3=95=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E8=AF=BB=E5=8F=96dhcp=E5=88=97=E8=A1=A8=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 1 + scripts/clash.sh | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 8a5da51..6f6f45a 100644 --- a/install.sh +++ b/install.sh @@ -110,6 +110,7 @@ echo ----------------------------------------------- gettar echo ----------------------------------------------- echo ShellClash 已经安装成功! +[ "$USER" != "root" ] && echo "请执行【source ~/.bashrc &> /dev/null】命令以加载环境变量！" echo ----------------------------------------------- $echo "\033[33m输入\033[30;47m clash \033[0;33m命令即可管理！！！\033[0m" echo ----------------------------------------------- diff --git a/scripts/clash.sh b/scripts/clash.sh index 1b1d576..5f4aec0 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -386,10 +386,10 @@ macfilter(){ fi } echo ----------------------------------------------- - [ -z "$dhcpdir" ] && dhcpdir='/var/lib/dhcp/dhcpd.leases' - [ -z "$dhcpdir" ] && dhcpdir='/var/lib/dhcpd/dhcpd.leases' - [ -z "$dhcpdir" ] && dhcpdir='/tmp/dhcp.leases' - [ -z "$dhcpdir" ] && dhcpdir='/tmp/dnsmasq.leases' + [ -z "$dhcpdir" ] && [ -f /var/lib/dhcp/dhcpd.leases ] && dhcpdir='/var/lib/dhcp/dhcpd.leases' + [ -z "$dhcpdir" ] && [ -f /var/lib/dhcpd/dhcpd.leases ] && dhcpdir='/var/lib/dhcpd/dhcpd.leases' + [ -z "$dhcpdir" ] && [ -f /tmp/dhcp.leases ] && dhcpdir='/tmp/dhcp.leases' + [ -z "$dhcpdir" ] && [ -f /tmp/dnsmasq.leases ] && dhcpdir='/tmp/dnsmasq.leases' [ -z "$dhcpdir" ] && dhcpdir='/dev/null' [ -z "$macfilter_type" ] && macfilter_type='黑名单' [ "$macfilter_type" = "黑名单" ] && macfilter_over='白名单' || macfilter_over='黑名单'