From 3d8a0d2916c31f9be0f956bb22636cf93b6f7b34 Mon Sep 17 00:00:00 2001 From: ElonH Date: Sun, 7 Jun 2020 20:09:38 +0800 Subject: [PATCH] luci-app-unblockneteasemusic-mini: fixed bug in image generation --- .../root/etc/init.d/unblockneteasemusic-mini | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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 6a98a8f53f..f8e011271a 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 @@ -5,26 +5,25 @@ START=92 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_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" - unblock_server_https_port="30001" -elif [ "${select_server}" = "aliyun_beijing_nodejs" ]; then - unblock_server_ip="$(ping "hyird.xyz" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" - [ -z "${unblock_server_ip}" ] && unblock_server_ip="182.92.84.98" - unblock_server_http_port="30000" - unblock_server_https_port="30001" -elif [ "${select_server}" = "aliyun_beijing_nodejs_2" ]; then - unblock_server_ip="39.96.56.58" - unblock_server_http_port="30000" - unblock_server_https_port="30001" -fi set_ipset(){ + select_server="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].select_server)" + + 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" + unblock_server_https_port="30001" + elif [ "${select_server}" = "aliyun_beijing_nodejs" ]; then + unblock_server_ip="$(ping "hyird.xyz" -c 1 | sed '1{s/[^(]*(//;s/).*//;q}')" + [ -z "${unblock_server_ip}" ] && unblock_server_ip="182.92.84.98" + unblock_server_http_port="30000" + unblock_server_https_port="30001" + elif [ "${select_server}" = "aliyun_beijing_nodejs_2" ]; then + unblock_server_ip="39.96.56.58" + unblock_server_http_port="30000" + unblock_server_https_port="30001" + fi if [ "${set_type}" = "start" ]; then mkdir -p "/tmp/dnsmasq.d" rm -f "/tmp/dnsmasq.d/dnsmasq-unblockneteasemusic-mini.conf" @@ -76,6 +75,7 @@ start() { stop + enable="$(uci get unblockneteasemusic-mini.@unblockneteasemusic-mini[0].enable)" [ "${enable}" -ne "1" ] && exit 0 set_type="start" set_ipset >/dev/null 2>&1