diff --git a/scripts/clash.sh b/scripts/clash.sh index b2bb263..244404a 100644 --- a/scripts/clash.sh +++ b/scripts/clash.sh @@ -33,22 +33,22 @@ getconfig(){ #dashboard目录位置 [ -d $clashdir/ui ] && dbdir=$clashdir/ui && hostdir=":$db_port/ui" [ -d /www/clash ] && dbdir=/www/clash && hostdir=/clash - #开机自启相关 + #开机自启检测 if [ -f /etc/rc.common ];then [ -n "$(find /etc/rc.d -name '*clash')" ] && autostart=enable_rc || autostart=disable_rc - else + elif [ -w /etc/systemd/system -o -w /usr/lib/systemd/system ];then [ -n "$(systemctl is-enabled clash.service 2>&1 | grep enable)" ] && autostart=enable_sys || autostart=disable_sys fi #开机自启描述 - if [ "$start_old" = "已开启" ];then - auto="\033[32m保守模式\033[0m" - auto1="代理本机:\033[36m$local_proxy\033[0m" - elif [ "$autostart" = "enable_rc" -o "$autostart" = "enable_sys" ]; then + if [ "$autostart" = "enable_rc" -o "$autostart" = "enable_sys" ]; then auto="\033[32m已设置开机启动!\033[0m" auto1="\033[36m禁用\033[0mclash开机启动" - else + elif [ "$autostart" = "disable_rc" -o "$autostart" = "disable_sys" ]; then auto="\033[31m未设置开机启动!\033[0m" auto1="\033[36m允许\033[0mclash开机启动" + else + auto="\033[32m保守模式\033[0m" + auto1="代理本机:\033[36m$local_proxy\033[0m" fi #获取运行模式 [ -z "$redir_mod" ] && [ "$USER" = "root" -o "$USER" = "admin" ] && redir_mod=Redir模式 diff --git a/scripts/getdate.sh b/scripts/getdate.sh index ac14035..40cca58 100644 --- a/scripts/getdate.sh +++ b/scripts/getdate.sh @@ -490,6 +490,7 @@ getgeo(){ mv -f /tmp/Country.mmdb $bindir/Country.mmdb echo ----------------------------------------------- echo -e "\033[32mGeoIP数据库文件下载成功!\033[0m" + Geo_v=$GeoIP_v setconfig Geo_v $GeoIP_v setconfig geotype $geotype fi diff --git a/scripts/start.sh b/scripts/start.sh index 91826cd..706afc6 100644 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -385,27 +385,29 @@ start_udp(){ } stop_iptables(){ #重置iptables规则 - iptables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1 - iptables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1 - iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash_dns > /dev/null 2>&1 - iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns > /dev/null 2>&1 - iptables -t nat -F clash > /dev/null 2>&1 - iptables -t nat -X clash > /dev/null 2>&1 - iptables -t nat -F clash_dns > /dev/null 2>&1 - iptables -t nat -X clash_dns > /dev/null 2>&1 - iptables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1 + ip rule del fwmark 1 table 100 2> /dev/null + ip route del local default dev lo table 100 2> /dev/null + iptables -t nat -D PREROUTING -p tcp -j clash 2> /dev/null + iptables -t nat -D PREROUTING -p udp -j clash_dns 2> /dev/null + iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash_dns 2> /dev/null + iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns 2> /dev/null + iptables -t nat -F clash 2> /dev/null + iptables -t nat -X clash 2> /dev/null + iptables -t nat -F clash_dns 2> /dev/null + iptables -t nat -X clash_dns 2> /dev/null + iptables -D FORWARD -o utun -j ACCEPT 2> /dev/null #重置udp规则 - iptables -t mangle -D PREROUTING -p udp -j clash > /dev/null 2>&1 - iptables -t mangle -F clash > /dev/null 2>&1 - iptables -t mangle -X clash > /dev/null 2>&1 + iptables -t mangle -D PREROUTING -p udp -j clash 2> /dev/null + iptables -t mangle -F clash 2> /dev/null + iptables -t mangle -X clash 2> /dev/null #重置ipv6规则 - ip6tables -t nat -D PREROUTING -p tcp -j clashv6 > /dev/null 2>&1 - ip6tables -t nat -D PREROUTING -p udp -j clashv6_dns > /dev/null 2>&1 - ip6tables -t nat -F clashv6 > /dev/null 2>&1 - ip6tables -t nat -X clashv6 > /dev/null 2>&1 - ip6tables -t nat -F clashv6_dns > /dev/null 2>&1 - ip6tables -t nat -X clashv6_dns > /dev/null 2>&1 - ip6tables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1 + ip6tables -t nat -D PREROUTING -p tcp -j clashv6 2> /dev/null + ip6tables -t nat -D PREROUTING -p udp -j clashv6_dns 2> /dev/null + ip6tables -t nat -F clashv6 2> /dev/null + ip6tables -t nat -X clashv6 2> /dev/null + ip6tables -t nat -F clashv6_dns 2> /dev/null + ip6tables -t nat -X clashv6_dns 2> /dev/null + ip6tables -D FORWARD -o utun -j ACCEPT 2> /dev/null } #面板配置保存相关 web_save(){