xm/ShellCrash
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.0beta17.8

Browse Source 
~增加了对padavan系统读取局域网设备过滤列表的支持
~优化了配置文件保存方式，减少闪存消耗
~修复了部分mipsle设备无法正确识别核心的bug
~修复了部分情况下订阅链接/配置链接丢失的bug
~修复了部分情况下会连续下载两次核心的bug
This commit is contained in:
juewuy
2020-12-13 22:12:52 +08:00
parent 66cc65f239
commit 872a84abc1
3 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/clash.sh
View File

@@ -33,22 +33,22 @@ getconfig(){
#dashboard目录位置 #dashboard目录位置
[ -d $clashdir/ui ] && dbdir=$clashdir/ui && hostdir=":$db_port/ui" [ -d $clashdir/ui ] && dbdir=$clashdir/ui && hostdir=":$db_port/ui"
[ -d /www/clash ] && dbdir=/www/clash && hostdir=/clash [ -d /www/clash ] && dbdir=/www/clash && hostdir=/clash
#开机自启相关 #开机自启检测
if [ -f /etc/rc.common ];then if [ -f /etc/rc.common ];then
[ -n "$(find /etc/rc.d -name '*clash')" ] && autostart=enable_rc || autostart=disable_rc [ -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 [ -n "$(systemctl is-enabled clash.service 2>&1 | grep enable)" ] && autostart=enable_sys || autostart=disable_sys
fi fi
#开机自启描述 #开机自启描述
if [ "$start_old" = "已开启" ];then if [ "$autostart" = "enable_rc" -o "$autostart" = "enable_sys" ]; then
auto="\033[32m保守模式\033[0m"
auto1="代理本机：\033[36m$local_proxy\033[0m"
elif [ "$autostart" = "enable_rc" -o "$autostart" = "enable_sys" ]; then
auto="\033[32m已设置开机启动！\033[0m" auto="\033[32m已设置开机启动！\033[0m"
auto1="\033[36m禁用\033[0mclash开机启动" auto1="\033[36m禁用\033[0mclash开机启动"
else elif [ "$autostart" = "disable_rc" -o "$autostart" = "disable_sys" ]; then
auto="\033[31m未设置开机启动！\033[0m" auto="\033[31m未设置开机启动！\033[0m"
auto1="\033[36m允许\033[0mclash开机启动" auto1="\033[36m允许\033[0mclash开机启动"
else
auto="\033[32m保守模式\033[0m"
auto1="代理本机：\033[36m$local_proxy\033[0m"
fi fi
#获取运行模式 #获取运行模式
[ -z "$redir_mod" ] && [ "$USER" = "root" -o "$USER" = "admin" ] && redir_mod=Redir模式 [ -z "$redir_mod" ] && [ "$USER" = "root" -o "$USER" = "admin" ] && redir_mod=Redir模式

1
scripts/getdate.sh
View File

@@ -490,6 +490,7 @@ getgeo(){
mv -f /tmp/Country.mmdb $bindir/Country.mmdb mv -f /tmp/Country.mmdb $bindir/Country.mmdb
echo ----------------------------------------------- echo -----------------------------------------------
echo -e "\033[32mGeoIP数据库文件下载成功！\033[0m" echo -e "\033[32mGeoIP数据库文件下载成功！\033[0m"
Geo_v=$GeoIP_v
setconfig Geo_v $GeoIP_v setconfig Geo_v $GeoIP_v
setconfig geotype $geotype setconfig geotype $geotype
fi fi

40
scripts/start.sh
View File

@@ -385,27 +385,29 @@ start_udp(){
} }
stop_iptables(){ stop_iptables(){
#重置iptables规则 #重置iptables规则
iptables -t nat -D PREROUTING -p tcp -j clash > /dev/null 2>&1 ip rule del fwmark 1 table 100 2> /dev/null
iptables -t nat -D PREROUTING -p udp -j clash_dns > /dev/null 2>&1 ip route del local default dev lo table 100 2> /dev/null
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 -j clash 2> /dev/null
iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns > /dev/null 2>&1 iptables -t nat -D PREROUTING -p udp -j clash_dns 2> /dev/null
iptables -t nat -F clash > /dev/null 2>&1 iptables -t nat -D PREROUTING -p tcp -d 8.8.8.8 -j clash_dns 2> /dev/null
iptables -t nat -X clash > /dev/null 2>&1 iptables -t nat -D PREROUTING -p tcp -d 8.8.4.4 -j clash_dns 2> /dev/null
iptables -t nat -F clash_dns > /dev/null 2>&1 iptables -t nat -F clash 2> /dev/null
iptables -t nat -X clash_dns > /dev/null 2>&1 iptables -t nat -X clash 2> /dev/null
iptables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1 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规则 #重置udp规则
iptables -t mangle -D PREROUTING -p udp -j clash > /dev/null 2>&1 iptables -t mangle -D PREROUTING -p udp -j clash 2> /dev/null
iptables -t mangle -F clash > /dev/null 2>&1 iptables -t mangle -F clash 2> /dev/null
iptables -t mangle -X clash > /dev/null 2>&1 iptables -t mangle -X clash 2> /dev/null
#重置ipv6规则 #重置ipv6规则
ip6tables -t nat -D PREROUTING -p tcp -j clashv6 > /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 > /dev/null 2>&1 ip6tables -t nat -D PREROUTING -p udp -j clashv6_dns 2> /dev/null
ip6tables -t nat -F clashv6 > /dev/null 2>&1 ip6tables -t nat -F clashv6 2> /dev/null
ip6tables -t nat -X clashv6 > /dev/null 2>&1 ip6tables -t nat -X clashv6 2> /dev/null
ip6tables -t nat -F clashv6_dns > /dev/null 2>&1 ip6tables -t nat -F clashv6_dns 2> /dev/null
ip6tables -t nat -X clashv6_dns > /dev/null 2>&1 ip6tables -t nat -X clashv6_dns 2> /dev/null
ip6tables -D FORWARD -o utun -j ACCEPT > /dev/null 2>&1 ip6tables -D FORWARD -o utun -j ACCEPT 2> /dev/null
} }
#面板配置保存相关 #面板配置保存相关
web_save(){ web_save(){