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='黑名单'