From 2aadd09b9f173cf4b37c0638255af900992f74e7 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 3 Mar 2020 15:30:05 +0800 Subject: [PATCH] OpenClash: sync with upstream source --- .../files/etc/init.d/openclash | 7 +++---- .../lib/lua/luci/view/openclash/developer.htm | 6 +++--- .../usr/lib/lua/luci/view/openclash/myip.htm | 1 - .../usr/lib/lua/luci/view/openclash/status.htm | 4 +++- .../files/usr/share/openclash/openclash.sh | 4 ++-- .../files/usr/share/openclash/openclash_core.sh | 10 ++++++++-- .../share/openclash/openclash_history_set.sh | 16 ++++++++++++++-- .../usr/share/openclash/openclash_update.sh | 11 +++++++++-- .../openclash/yacd/8.3361cb36d32327fae41e.js | 2 -- .../openclash/yacd/8.ab0cff960a5b01ba8822.js | 2 ++ ...xt => 8.ab0cff960a5b01ba8822.js.LICENSE.txt} | 0 .../files/usr/share/openclash/yacd/_headers | 12 ++++++++++++ .../openclash/yacd/app.52c1edcce9d28ad103e5.js | 2 ++ ... => app.52c1edcce9d28ad103e5.js.LICENSE.txt} | 0 ...d5e1e73.css => app.7b7c4c1f4709f2490841.css} | 5 ++--- .../openclash/yacd/app.bd4b077ac38d27d94ff2.js | 2 -- .../files/usr/share/openclash/yacd/index.html | 6 +++--- ...9a498.js => proxies.885cb4b4a87c66e08e71.js} | 0 .../files/usr/share/openclash/yacd/public.tgz | Bin 0 -> 29 bytes .../files/usr/share/openclash/yacd/report.html | 4 ++-- ...1681a8b.js => rules.77b403da39cb4f89767e.js} | 0 ...cd6b4.js => runtime.0b409d402f89d6765576.js} | 2 +- .../vendors~proxies.0ab0478edefe25bc30a4.js | 1 + .../vendors~proxies.0af997e119f76c516134.js | 2 -- ...~proxies.0af997e119f76c516134.js.LICENSE.txt | 14 -------------- 25 files changed, 67 insertions(+), 46 deletions(-) delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/8.3361cb36d32327fae41e.js create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/8.ab0cff960a5b01ba8822.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{8.3361cb36d32327fae41e.js.LICENSE.txt => 8.ab0cff960a5b01ba8822.js.LICENSE.txt} (100%) create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/_headers create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.52c1edcce9d28ad103e5.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{app.bd4b077ac38d27d94ff2.js.LICENSE.txt => app.52c1edcce9d28ad103e5.js.LICENSE.txt} (100%) rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{app.02ba11cfe63c3d5e1e73.css => app.7b7c4c1f4709f2490841.css} (91%) delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/app.bd4b077ac38d27d94ff2.js rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{proxies.c47b16ee58ce8279a498.js => proxies.885cb4b4a87c66e08e71.js} (100%) create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/public.tgz rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{rules.14d9a873af5f71681a8b.js => rules.77b403da39cb4f89767e.js} (100%) rename package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/{runtime.bff50a6a16255f3cd6b4.js => runtime.0b409d402f89d6765576.js} (94%) create mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.0ab0478edefe25bc30a4.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.0af997e119f76c516134.js delete mode 100644 package/ctcgfw/luci-app-openclash/files/usr/share/openclash/yacd/vendors~proxies.0af997e119f76c516134.js.LICENSE.txt diff --git a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash index 95a661afd2..d9f1e86ade 100755 --- a/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash +++ b/package/ctcgfw/luci-app-openclash/files/etc/init.d/openclash @@ -72,11 +72,11 @@ change_dns() { revert_dns() { uci del_list dhcp.@dnsmasq[0].server=127.0.0.1#"$3" >/dev/null 2>&1 [ "$1" = "1" ] && { - uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto - uci set dhcp.@dnsmasq[0].noresolv=0 + uci set dhcp.@dnsmasq[0].resolvfile=/tmp/resolv.conf.auto >/dev/null 2>&1 + uci set dhcp.@dnsmasq[0].noresolv=0 >/dev/null 2>&1 } [ "$2" = "1" ] && { - uci delete dhcp.@dnsmasq[0].cachesize + uci delete dhcp.@dnsmasq[0].cachesize >/dev/null 2>&1 } uci commit dhcp rm -rf /tmp/dnsmasq.d/dnsmasq_openclash.conf >/dev/null 2>&1 @@ -327,7 +327,6 @@ if [ -z "$(pidof clash)" ] && [ "$proxy_provider_mode" = 1 ]; then echo "错误: OpenClash 启动失败,请到日志页面查看详细错误信息!" >$START_LOG echo "${LOGTIME} OpenClash Can Not Start, Please Check The Error Info And Try Again" >> $LOG_FILE sleep 10 - echo "" >$START_LOG stop && echo "" >$START_LOG exit 0 fi diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/developer.htm b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/developer.htm index f885184f3e..cdc47eadab 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/developer.htm +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/developer.htm @@ -29,13 +29,13 @@ Dreamacro.innerHTML = 'Dreamacro'; vernesong.innerHTML = 'vernesong'; frainzy1477.innerHTML = 'frainzy1477'; - SukkaW.innerHTML = 'SukkaW'; - lhie1_dev.innerHTML = 'lhie1'; + SukkaW.innerHTML = 'SukkaW'; + lhie1_dev.innerHTML = 'lhie1'; ConnersHua_dev.innerHTML = 'ConnersHua'; MaxMind.innerHTML = 'MaxMind'; haishanh.innerHTML = 'haishanh'; FQrabbit.innerHTML = 'FQrabbit'; - Fndroid.innerHTML = 'Fndroid'; + Fndroid.innerHTML = 'Fndroid'; function Dreamacro_rediret() { url1='https://github.com/Dreamacro'; diff --git a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/myip.htm b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/myip.htm index f4d4ebc5ea..d4b8b20d72 100644 --- a/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/myip.htm +++ b/package/ctcgfw/luci-app-openclash/files/usr/lib/lua/luci/view/openclash/myip.htm @@ -20,7 +20,6 @@ - IP 地址查询