From f55d623079d1c171430cf6a84edad16e005ab244 Mon Sep 17 00:00:00 2001
From: Saxon <18494610+Saxon-Sun@users.noreply.github.com>
Date: Mon, 27 Dec 2021 15:53:33 +0800
Subject: [PATCH] UnblockNeteaseMusic: Bug Fix (#8524)

* UnblockNeteaseMusic: Change Redirect source

* Fix UnblockNeteaseMusic Version display error

* Fix UnblockNeteaseMusic update error

* Bump luci-app-unblockmusic PKG_RELEASE
---
 package/lean/luci-app-unblockmusic/Makefile         |  2 +-
 .../usr/share/UnblockNeteaseMusic/update_core.sh    | 13 ++++++-------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/package/lean/luci-app-unblockmusic/Makefile b/package/lean/luci-app-unblockmusic/Makefile
index 4a2c08bcb..d3756c485 100644
--- a/package/lean/luci-app-unblockmusic/Makefile
+++ b/package/lean/luci-app-unblockmusic/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=luci-app-unblockmusic
 PKG_VERSION:=2.3.5
-PKG_RELEASE:=19
+PKG_RELEASE:=20
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=lean
diff --git a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh
index 1414e1f58..2d4b026f1 100755
--- a/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh
+++ b/package/lean/luci-app-unblockmusic/root/usr/share/UnblockNeteaseMusic/update_core.sh
@@ -10,7 +10,7 @@ function clean_log(){
 }
 
 function check_latest_version(){
-	latest_ver="$(uclient-fetch --no-check-certificate -O- https://github.com/1715173329/UnblockNeteaseMusic/commits/enhanced |tr -d '\n' |grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g')"
+	latest_ver="$(uclient-fetch --no-check-certificate -O- https://github.com/UnblockNeteaseMusic/server/commits/enhanced |tr -d '\n' |grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g')"
 	[ -z "${latest_ver}" ] && echo -e "\nFailed to check latest version, please try again later." >>/tmp/unblockmusic_update.log && exit 1
 	if [ ! -e "/usr/share/UnblockNeteaseMusic/local_ver" ]; then
 		clean_log
@@ -19,7 +19,6 @@ function check_latest_version(){
 	else
 		if [ "$(cat /usr/share/UnblockNeteaseMusic/local_ver)" != "${latest_ver}" ]; then
 			clean_log
-			echo -e "Local version: $(cat /usr/share/UnblockNeteaseMusic/local_ver 2>/dev/null), cloud version: ${latest_ver}." >>/tmp/unblockmusic_update.log
 			update_core
 		else
 			echo -e "\nLocal version: $(cat /usr/share/UnblockNeteaseMusic/local_ver 2>/dev/null), cloud version: ${latest_ver}." >>/tmp/unblockmusic_update.log
@@ -36,12 +35,12 @@ function update_core(){
 	mkdir -p "/tmp/unblockneteasemusic/core" >/dev/null 2>&1
 	rm -rf /tmp/unblockneteasemusic/core/* >/dev/null 2>&1
 
-	uclient-fetch --no-check-certificate -T 10 -O  /tmp/unblockneteasemusic/core/core.tar.gz "https://github.com/1715173329/UnblockNeteaseMusic/archive/enhanced.tar.gz"  >/dev/null 2>&1
+	uclient-fetch --no-check-certificate -T 10 -O  /tmp/unblockneteasemusic/core/core.tar.gz "https://github.com/UnblockNeteaseMusic/server/archive/enhanced.tar.gz"  >/dev/null 2>&1
 	tar -zxf "/tmp/unblockneteasemusic/core/core.tar.gz" -C "/tmp/unblockneteasemusic/core/" >/dev/null 2>&1
 	if [ -e "/usr/share/UnblockNeteaseMusic/ca.crt" ] && [ -e "/usr/share/UnblockNeteaseMusic/server.crt" ] && [ -e "/usr/share/UnblockNeteaseMusic/server.key" ] ; then
-		rm -f /tmp/unblockneteasemusic/core/UnblockNeteaseMusic-enhanced/ca.crt /tmp/unblockneteasemusic/core/UnblockNeteaseMusic-enhanced/server.crt /tmp/unblockneteasemusic/core/UnblockNeteaseMusic-enhanced/server.key
+		rm -f /tmp/unblockneteasemusic/core/server-enhanced/ca.crt /tmp/unblockneteasemusic/core/server-enhanced/server.crt /tmp/unblockneteasemusic/core/server-enhanced/server.key
 	fi
-	cp -a /tmp/unblockneteasemusic/core/UnblockNeteaseMusic-enhanced/* "/usr/share/UnblockNeteaseMusic/"
+	cp -a /tmp/unblockneteasemusic/core/server-enhanced/* "/usr/share/UnblockNeteaseMusic/"
 	rm -rf "/tmp/unblockneteasemusic" >/dev/null 2>&1
 
 	if [ ! -e "/usr/share/UnblockNeteaseMusic/app.js" ]; then
@@ -49,10 +48,10 @@ function update_core(){
 		exit 1
 	else
 		echo -e "${latest_ver}" > /usr/share/UnblockNeteaseMusic/local_ver
-		cat /usr/share/UnblockNeteaseMusic/package.json | grep version |awk -F ':' '{print $2}' | cut -c3-8 > /usr/share/UnblockNeteaseMusic/core_ver
+		cat /usr/share/UnblockNeteaseMusic/package.json | grep version |awk -F ':' '{print $2}' | sed -r 's/.*"(.+)".*/\1/' > /usr/share/UnblockNeteaseMusic/core_ver
 	fi
 
-	echo -e "Succeeded in updating core." >/tmp/unblockmusic_update.log
+	echo -e "Succeeded in updating core." >>/tmp/unblockmusic_update.log
 	echo -e "Local version: $(cat /usr/share/UnblockNeteaseMusic/local_ver 2>/dev/null), cloud version: ${latest_ver}.\n" >>/tmp/unblockmusic_update.log
 	
 	/etc/init.d/unblockmusic restart