From 10cd9a0a3e7998896d82c6201a81e1caff4a8c54 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 20 Jul 2019 23:54:54 +0800 Subject: [PATCH] luci-app-chinadns: fix errors --- .../cnsztl/luci-app-chinadns/files/luci/model/cbi/chinadns.lua | 3 +-- .../cnsztl/luci-app-chinadns/files/root/etc/config/chinadns | 1 + .../cnsztl/luci-app-chinadns/files/root/etc/init.d/chinadns | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package/cnsztl/luci-app-chinadns/files/luci/model/cbi/chinadns.lua b/package/cnsztl/luci-app-chinadns/files/luci/model/cbi/chinadns.lua index f9a27f574c..774125ef02 100644 --- a/package/cnsztl/luci-app-chinadns/files/luci/model/cbi/chinadns.lua +++ b/package/cnsztl/luci-app-chinadns/files/luci/model/cbi/chinadns.lua @@ -18,7 +18,7 @@ o = s:option(Flag, "enable", translate("Enable")) o.rmempty = false o = s:option(Flag, "yn_use_proxy", - translate("Used a proxy or not") + translate("Used a proxy or not"), translate("If you used a proxy like shadowsocks, please tick this option.")) o.rmenpty = false @@ -40,7 +40,6 @@ o = s:option(Value, "foreign_subnet", o.placeholder = "45.76.96.0" o.default = "45.76.96.0" o.datatype = "ipaddr" -o.rmempty = false o:depends("yn_use_proxy", 0) o = s:option(Value, "server", diff --git a/package/cnsztl/luci-app-chinadns/files/root/etc/config/chinadns b/package/cnsztl/luci-app-chinadns/files/root/etc/config/chinadns index 8ef7301e85..b7adc367aa 100644 --- a/package/cnsztl/luci-app-chinadns/files/root/etc/config/chinadns +++ b/package/cnsztl/luci-app-chinadns/files/root/etc/config/chinadns @@ -1,6 +1,7 @@ config chinadns option chnroute '/etc/chinadns_chnroute.txt' option enable '0' + option yn_use_proxy '0' option port '5300' option server '8.8.8.8' option foreign_subnet '45.76.96.0' diff --git a/package/cnsztl/luci-app-chinadns/files/root/etc/init.d/chinadns b/package/cnsztl/luci-app-chinadns/files/root/etc/init.d/chinadns index fc6e35d246..235465f8db 100755 --- a/package/cnsztl/luci-app-chinadns/files/root/etc/init.d/chinadns +++ b/package/cnsztl/luci-app-chinadns/files/root/etc/init.d/chinadns @@ -44,7 +44,7 @@ start_chinadns() { [ "$enable" = 1 ] || return 0 config_get_bool yn_use_proxy $1 yn_use_proxy [ "$yn_use_proxy" = 0 ] && local foreign_subnet && config_get foreign_subnet $1 foreign_subnet - [ "$yn_use_proxy" = 1 ] && local foregin_subnet=$(echo `curl -4 -s ip.sb | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.'`0) + [ "$yn_use_proxy" = 1 ] && local foreign_subnet=$(echo `curl -4 -s ip.sb | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.'`0) append_parm $1 port "-p" append_parm $1 server "-s" append_parm $1 chnroute "-c"