From ac3d8a71072b3ca23f09a93a6fdbb41ffb07931e Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 25 Feb 2020 18:00:38 +0800 Subject: [PATCH] luci-app-clash: bump to 1.5.8a --- .../luci-app-clash/luasrc/model/cbi/clash/update.lua | 10 +++++++--- .../luci-app-clash/root/usr/share/clash/dns.yaml | 6 +++++- .../luci-app-clash/root/usr/share/clash/tundns.yaml | 5 ++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua index 5d33ce9152..271ca7dc61 100644 --- a/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua +++ b/package/ntlf9t/luci-app-clash/luasrc/model/cbi/clash/update.lua @@ -76,16 +76,20 @@ http.setfilehandler( fd = nil if fp == "clash" then - SYS.exec("chmod 755 /etc/clash/clash 2>&1 &") + SYS.exec("chmod 755 /etc/clash/clash 2>&1 &") + SYS.exec("rm -rf /usr/share/clash/core_version 2>/dev/null && /etc/clash/clash -v | awk -F ' ' '{print $2}' >> /usr/share/clash/core_version 2>/dev/null") um.value = translate("File saved to") .. ' "/etc/clash/'..meta.file..'"' elseif fp == "clashr" then - SYS.exec("chmod 755 /usr/bin/clash 2>&1 &") + SYS.exec("chmod 755 /usr/bin/clash 2>&1 &") + SYS.exec("rm -rf /usr/share/clash/corer_version 2>/dev/null && /usr/bin/clash -v | awk -F ' ' '{print $2}' >> /usr/share/clash/corer_version 2>/dev/null") um.value = translate("File saved to") .. ' "/usr/bin/'..meta.file..'"' elseif fp == "clashctun" then - SYS.exec("chmod 755 /etc/clash/clashtun/clash 2>&1 &") + SYS.exec("chmod 755 /etc/clash/clashtun/clash 2>&1 &") + SYS.exec("rm -rf /usr/share/clash/tun_version 2>/dev/null && /etc/clash/clashtun/clash -v | awk -F ' ' '{print $2}' >> /usr/share/clash/tun_version 2>/dev/null") um.value = translate("File saved to") .. ' "/etc/clash/clashtun/'..meta.file..'"' elseif fp == "clashdtun" then SYS.exec("chmod 755 /etc/clash/dtun/clash 2>&1 &") + SYS.exec("rm -rf /usr/share/clash/dtun_core_version 2>/dev/null && /etc/clash/dtun/clash -v | awk -F ' ' '{print $2}' >> /usr/share/clash/dtun_core_version 2>/dev/null") um.value = translate("File saved to") .. ' "/etc/clash/dtun/'..meta.file..'"' end diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/dns.yaml b/package/ntlf9t/luci-app-clash/root/usr/share/clash/dns.yaml index 153618c6c0..a469872004 100644 --- a/package/ntlf9t/luci-app-clash/root/usr/share/clash/dns.yaml +++ b/package/ntlf9t/luci-app-clash/root/usr/share/clash/dns.yaml @@ -1,7 +1,8 @@ experimental: ignore-resolve-fail: true - + # interface-name: eth0 + #authentication: # - "user1:pass1" @@ -12,6 +13,9 @@ experimental: dns: enable: true listen: 0.0.0.0:5300 + # # default-nameserver: + # # - 114.114.114.114 + # # - 8.8.8.8 enhanced-mode: fake-ip fake-ip-range: 198.18.0.1/16 #fake-ip-filter: diff --git a/package/ntlf9t/luci-app-clash/root/usr/share/clash/tundns.yaml b/package/ntlf9t/luci-app-clash/root/usr/share/clash/tundns.yaml index 4e188395d8..deabf53633 100644 --- a/package/ntlf9t/luci-app-clash/root/usr/share/clash/tundns.yaml +++ b/package/ntlf9t/luci-app-clash/root/usr/share/clash/tundns.yaml @@ -1,6 +1,6 @@ experimental: ignore-resolve-fail: true - + # interface-name: eth0 tun: enable: true device-url: dev://utun @@ -16,6 +16,9 @@ tun: dns: enable: true listen: 0.0.0.0:5300 + # # default-nameserver: + # # - 114.114.114.114 + # # - 8.8.8.8 enhanced-mode: fake-ip fake-ip-range: 198.18.0.1/16 nameserver: