From fa1929fc808cb67acc6e38a147cf5e2c190191ee Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 4 Mar 2020 22:53:54 +0800 Subject: [PATCH] luci-app-unblockneteasemusic-mini: bump to v1.2-7 --- package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile | 2 +- .../luasrc/model/cbi/unblockneteasemusic-mini.lua | 1 - .../root/etc/init.d/unblockneteasemusic-mini | 7 +------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile index 9b67bb1b44..6a05da685d 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-unblockneteasemusic-mini PKG_VERSION:=1.2 -PKG_RELEASE:=6 +PKG_RELEASE:=7 LUCI_TITLE:=LuCI support for UnblockNeteaseMusic(-Go) LUCI_DEPENDS:=+busybox +dnsmasq-full +ipset +iptables +wget LUCI_PKGARCH:=all diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua index 915764e009..aa534c72ed 100644 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/luasrc/model/cbi/unblockneteasemusic-mini.lua @@ -16,7 +16,6 @@ enable.default = 0 enable.rmempty = false select_server = s:option(ListValue, "select_server", translate("服务器位置")) -select_server:value("tencent_shanghai_golang", translate("[CTCGFW] 腾讯云上海（低音质）")) select_server:value("tencent_shanghai_nodejs", translate("[CTCGFW] 腾讯云上海（高音质）")) select_server:value("aliyun_beijing_nodejs", translate("[hyird] 阿里云北京（高音质）")) select_server:value("aliyun_beijing_nodejs_2", translate("[Sunsky] 阿里云北京（高音质）")) diff --git a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini index 9b05ff1c88..1e9915ba84 100755 --- a/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini +++ b/package/ctcgfw/luci-app-unblockneteasemusic-mini/root/etc/init.d/unblockneteasemusic-mini @@ -8,12 +8,7 @@ STOP=10 enable="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].enable)" select_server="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].select_server)" -if [ "${select_server}" = "tencent_shanghai_golang" ]; then - unblock_server_ip="$(ping "cdn-shanghai.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" - [ -z "${unblock_server_ip}" ] && unblock_server_ip="122.51.88.18" - unblock_server_http_port="30002" - unblock_server_https_port="30003" -elif [ "${select_server}" = "tencent_shanghai_nodejs" ]; then +if [ "${select_server}" = "tencent_shanghai_nodejs" ]; then unblock_server_ip="$(ping "cdn-shanghai.service.project-openwrt.eu.org" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" [ -z "${unblock_server_ip}" ] && unblock_server_ip="122.51.88.18" unblock_server_http_port="30000"