UnblockNeteaseMusic: Bug Fix (#8524)

* UnblockNeteaseMusic: Change Redirect source

* Fix UnblockNeteaseMusic Version display error

* Fix UnblockNeteaseMusic update error

* Bump luci-app-unblockmusic PKG_RELEASE
This commit is contained in:
Saxon 2021-12-27 15:53:33 +08:00 committed by GitHub
parent 9f09554986
commit f55d623079
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions

View File

@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-unblockmusic PKG_NAME:=luci-app-unblockmusic
PKG_VERSION:=2.3.5 PKG_VERSION:=2.3.5
PKG_RELEASE:=19 PKG_RELEASE:=20
PKG_LICENSE:=Apache-2.0 PKG_LICENSE:=Apache-2.0
PKG_MAINTAINER:=lean PKG_MAINTAINER:=lean

View File

@ -10,7 +10,7 @@ function clean_log(){
} }
function check_latest_version(){ 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 [ -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 if [ ! -e "/usr/share/UnblockNeteaseMusic/local_ver" ]; then
clean_log clean_log
@ -19,7 +19,6 @@ function check_latest_version(){
else else
if [ "$(cat /usr/share/UnblockNeteaseMusic/local_ver)" != "${latest_ver}" ]; then if [ "$(cat /usr/share/UnblockNeteaseMusic/local_ver)" != "${latest_ver}" ]; then
clean_log 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 update_core
else else
echo -e "\nLocal version: $(cat /usr/share/UnblockNeteaseMusic/local_ver 2>/dev/null), cloud version: ${latest_ver}." >>/tmp/unblockmusic_update.log 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 mkdir -p "/tmp/unblockneteasemusic/core" >/dev/null 2>&1
rm -rf /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 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 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 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 rm -rf "/tmp/unblockneteasemusic" >/dev/null 2>&1
if [ ! -e "/usr/share/UnblockNeteaseMusic/app.js" ]; then if [ ! -e "/usr/share/UnblockNeteaseMusic/app.js" ]; then
@ -49,10 +48,10 @@ function update_core(){
exit 1 exit 1
else else
echo -e "${latest_ver}" > /usr/share/UnblockNeteaseMusic/local_ver 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 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 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 /etc/init.d/unblockmusic restart