chore: remove stupid kp compat and cleanup uclient-fetch arg

Signed-off-by: Tianling Shen <[email protected]>

luasrc/controller/unblockneteasemusic.lua

@@ -30,7 +30,7 @@ function act_status()
 end
 
 function update_core()
-	core_cloud_ver=luci.sys.exec("uclient-fetch -q -O- 'https://api.github.com/repos/UnblockNeteaseMusic/server/commits/enhanced' | jsonfilter -e '@.sha'")
+	core_cloud_ver=luci.sys.exec("uclient-fetch -qO- 'https://api.github.com/repos/UnblockNeteaseMusic/server/commits/enhanced' | jsonfilter -e '@.sha'")
 	core_cloud_ver_mini=string.sub(core_cloud_ver, 1, 7)
 	if not core_cloud_ver or not core_cloud_ver_mini then
 		return "1"

root/etc/init.d/unblockneteasemusic

@@ -164,7 +164,6 @@ start_service()
 		$IPT_N -A "netease_cloud_music" -p "tcp" -m "set" ! --match-set "acl_neteasemusic_http" "src" --dport "80" -j "REDIRECT" --to-ports "${http_port}"
 		$IPT_N -A "netease_cloud_music" -p "tcp" -m "set" ! --match-set "acl_neteasemusic_https" "src" --dport "443" -j "REDIRECT" --to-ports "${https_port}"
 		$IPT_N -I "PREROUTING" -p "tcp" -m "set" --match-set "neteasemusic" "dst" -j "netease_cloud_music"
-		$IPT_N -I "KOOLPROXY" -m "set" --match-set "neteasemusic" "dst" -j "RETURN" -m "comment" --comment "KP for UnblockMusic"
 
 		mkdir -p "/var/etc/"
 		echo "/etc/init.d/$NAME restart" > "/var/etc/$NAME.include"
@@ -217,7 +216,6 @@ stop_service()
 	}
 
 	$IPT_N -D "PREROUTING" -p "tcp" -m set --match-set "neteasemusic" "dst" -j "netease_cloud_music"
-	$IPT_N -D "KOOLPROXY" -m "set" --match-set "neteasemusic" "dst" -j "RETURN" -m "comment" --comment "KP for UnblockMusic"
 	$IPT_N -F "netease_cloud_music"
 	$IPT_N -X "netease_cloud_music"
 	ipset destroy "neteasemusic"

root/usr/share/unblockneteasemusic/update.sh

@@ -14,7 +14,7 @@ function clean_log(){
 }
 
 function check_core_latest_version(){
-	core_latest_ver="$(uclient-fetch -q -O- 'https://api.github.com/repos/UnblockNeteaseMusic/server/commits/enhanced' | jsonfilter -e '@.sha')"
+	core_latest_ver="$(uclient-fetch -qO- 'https://api.github.com/repos/UnblockNeteaseMusic/server/commits/enhanced' | jsonfilter -e '@.sha')"
 	[ -z "${core_latest_ver}" ] && { echo -e "\nFailed to check latest core version, please try again later." >> "/tmp/$NAME.log"; exit 1; }
 	if [ ! -e "/usr/share/$NAME/core_local_ver" ]; then
 		clean_log
@@ -39,7 +39,7 @@ function update_core(){
 	mkdir -p "/usr/share/$NAME/core" > "/dev/null" 2>&1
 	rm -rf /usr/share/$NAME/core/* > "/dev/null" 2>&1
 
-	uclient-fetch -q "https://codeload.github.com/UnblockNeteaseMusic/server/tar.gz/${core_latest_ver}" -O "/usr/share/$NAME/core/core.tar.gz" > "/dev/null" 2>&1
+	uclient-fetch "https://codeload.github.com/UnblockNeteaseMusic/server/tar.gz/${core_latest_ver}" -qO "/usr/share/$NAME/core/core.tar.gz" > "/dev/null" 2>&1
 	tar -zxf "/usr/share/$NAME/core/core.tar.gz" -C "/usr/share/$NAME/core/" > "/dev/null" 2>&1
 	mv "/usr/share/$NAME/core/server-${core_latest_ver}"/* "/usr/share/$NAME/core/"
 	rm -rf "/usr/share/$NAME/core/core.tar.gz" "/usr/share/$NAME/core/server-${core_latest_ver}" > "/dev/null" 2>&1