From dce2dd8b33223c36b3c64e1a75ac9bcce5edb0e8 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Mon, 29 Jul 2019 01:47:46 +0800 Subject: [PATCH] luci-app-openclash & luci-app-koolproxy: sync source --- .../luci-app-openclash/files/etc/init.d/openclash | 6 ------ .../lib/lua/luci/model/cbi/openclash/settings.lua | 3 ++- .../usr/lib/lua/luci/view/openclash/update.htm | 4 ++-- .../luci-app-openclash/tools/po2lmo/src/po2lmo | Bin .../files/usr/share/koolproxy/data/source.list | 2 +- .../files/usr/share/koolproxy/kpupdate | 2 +- package/jsda/luci-app-koolproxy/koolproxyupdate.sh | 2 +- 7 files changed, 7 insertions(+), 12 deletions(-) mode change 100644 => 100755 package/cnsztl/luci-app-openclash/tools/po2lmo/src/po2lmo diff --git a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash index 0b323626c0..7e145aa0ce 100755 --- a/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash +++ b/package/cnsztl/luci-app-openclash/files/etc/init.d/openclash @@ -344,9 +344,6 @@ if [ "$enable" -eq 1 ] && [ -f "$CONFIG_FILE" ]; then echo "第六步: 设置 OpenClash 防火墙规则..." >$START_LOG ln -s /usr/share/openclash/yacd /www/openclash 2>/dev/null - uci set firewall.@defaults[0].flow_offloading=1 - uci commit firewall - /etc/init.d/firewall restart >/dev/null 2>&1 iptables -t nat -N openclash iptables -t nat -N openclash_dns @@ -438,9 +435,6 @@ stop() ip6tables -t nat -X openclash >/dev/null 2>&1 ip6tables -t nat -X openclash_dns >/dev/null 2>&1 - uci set firewall.@defaults[0].flow_offloading=1 - uci commit firewall - /etc/init.d/firewall restart >/dev/null 2>&1 echo "第二步: 关闭 OpenClash 守护程序..." >$START_LOG kill -9 "$(ps |grep openclash_watchdog.sh |grep -v grep |awk '{print $1}')" >/dev/null 2>&1 diff --git a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua index a138493042..4159c879ca 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua +++ b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/model/cbi/openclash/settings.lua @@ -33,7 +33,8 @@ o:value("linux-mips-hardfloat") o:value("linux-mips-softfloat") o:value("linux-mips64") o:value("linux-mips64le") -o:value("linux-mipsle") +o:value("linux-mipsle-softfloat") +o:value("linux-mipsle-hardfloat") o:value("0", translate("Not Set")) o.default=0 diff --git a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm index 33300b856d..059c8e1c1e 100644 --- a/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm +++ b/package/cnsztl/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/update.htm @@ -2,7 +2,7 @@
- + @@ -194,7 +194,7 @@ var rdmdl=Math.floor(Math.random()*2)+1; if(rdmdl==1) { - update_tip.innerHTML = '<%: 注意：如下载失败可手动下载并上传，内核路径为：/etc/openclash %>'; + update_tip.innerHTML = '<%: 注意：如更新失败可手动下载并上传，内核路径为：/etc/openclash %>'; } if(rdmdl==2) { diff --git a/package/cnsztl/luci-app-openclash/tools/po2lmo/src/po2lmo b/package/cnsztl/luci-app-openclash/tools/po2lmo/src/po2lmo old mode 100644 new mode 100755 diff --git a/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list b/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list index 0f926fb4f8..b381ef3fda 100644 --- a/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list +++ b/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/data/source.list @@ -1,5 +1,5 @@ 0|yhosts.txt|https://github.com/user1121114685/koolproxyR/raw/master/koolproxyR/koolproxyR/data/rules/yhosts.txt|yhosts规则 -0|kp.dat|https://kprule.com/kp.dat|视频规则 +0|kp.dat|https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat|视频规则 0|user.txt||自定义规则 0|easylistchina.txt|https://github.com/user1121114685/koolproxyR/raw/master/koolproxyR/koolproxyR/data/rules/easylistchina.txt|ABP规则 0|chengfeng.txt|https://kprule.com/chengfeng.txt|乘风规则 diff --git a/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/kpupdate b/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/kpupdate index 185cdb268a..324ee25f1e 100755 --- a/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/kpupdate +++ b/package/jsda/luci-app-koolproxy/files/usr/share/koolproxy/kpupdate @@ -109,7 +109,7 @@ update_rss_rules() { update_rules() { echo $(date "+%F %T"): ------------------- 内置规则更新 ------------------- >>$LOGFILE - wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/kp.dat' -q -O $KP_DIR/data/rules/kp.dat + wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat' -q -O $KP_DIR/data/rules/kp.dat wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/yhosts.txt' -q -O $KP_DIR/data/rules/yhosts.txt wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/fanboy-annoyance.txt' -q -O $KP_DIR/data/rules/fanboy.txt wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/easylistchina.txt' -q -O $KP_DIR/data/rules/easylistchina.txt diff --git a/package/jsda/luci-app-koolproxy/koolproxyupdate.sh b/package/jsda/luci-app-koolproxy/koolproxyupdate.sh index 22d25060cd..6a5ba13e09 100755 --- a/package/jsda/luci-app-koolproxy/koolproxyupdate.sh +++ b/package/jsda/luci-app-koolproxy/koolproxyupdate.sh @@ -1,4 +1,4 @@ -wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/kp.dat' -O files/usr/share/koolproxy/data/rules/kp.dat +wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR_rule_list/master/kp.dat' -O files/usr/share/koolproxy/data/rules/kp.dat wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/yhosts.txt' -O files/usr/share/koolproxy/data/rules/yhosts.txt wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/fanboy-annoyance.txt' -O files/usr/share/koolproxy/data/rules/fanboy.txt wget 'https://raw.githubusercontent.com/user1121114685/koolproxyR/master/koolproxyR/koolproxyR/data/rules/easylistchina.txt' -O files/usr/share/koolproxy/data/rules/easylistchina.txt
注意：如下载失败可手动下载并上传，内核路径为：/etc/openclash
注意：如更新失败可手动下载并上传，内核路径为：/etc/openclash
已选择编译版本 <%:Collecting data...%> 上次检查更新时间 <%:Collecting data...%>
处理器架构（PROC） <%:Collecting data...%> 处理器架构（OPKG） <%:Collecting data...%>
当前内核版本 <%:Collecting data...%> 当前客户端版本 <%:Collecting data...%>