From f86a0073d9c1b0a10de36cf828f2cd736dc1d9f7 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Thu, 3 Oct 2019 15:52:38 +0800 Subject: [PATCH] luci-app-unblockneteasemusic: meaningless update --- .../root/etc/init.d/unblockneteasemusic | 1 - .../root/usr/share/unblockneteasemusic/check_update.sh | 4 ++-- .../root/usr/share/unblockneteasemusic/update_core.sh | 4 ++-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic b/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic index a5e42c4eba..2f94dcdaac 100755 --- a/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic +++ b/package/cnsztl/luci-app-unblockneteasemusic/root/etc/init.d/unblockneteasemusic @@ -142,7 +142,6 @@ start() stop() { { ps |grep "unblockneteasemusic" |grep "app.js" |grep -v "grep" |awk '{print $1}' |xargs kill -9; } >/dev/null 2>&1 - sed -i '/unblockneteasemusic/d' /etc/crontabs/root /etc/init.d/cron restart >/dev/null 2>&1 diff --git a/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/check_update.sh b/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/check_update.sh index ed175d1a69..b31f3e646c 100755 --- a/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/check_update.sh +++ b/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/check_update.sh @@ -3,7 +3,7 @@ # https://github.com/project-openwrt commit_info="$(curl -s https://github.com/nondanee/UnblockNeteaseMusic/commits/master)" -latest_ver="$(echo -e "${commit_info}" |tr '\n' ' ' | grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g')" +latest_ver="$(echo -e "${commit_info}" |tr -d '\n' | grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g')" latest_ver_mini="$(echo -e "${commit_info}" |tr -d '\n' | grep -Eo 'BtnGroup-item"> [0-9a-z]+' |sed -n 1p |sed 's#BtnGroup-item"> ##g')" [ -z "${commit_info}" ] && echo "无法检测最新版本,请稍后重试" && exit 1 @@ -18,4 +18,4 @@ else else echo "目前已是最新版本,无需更新" fi -fi \ No newline at end of file +fi diff --git a/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update_core.sh b/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update_core.sh index 59d0247d21..e08a2b6d81 100755 --- a/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update_core.sh +++ b/package/cnsztl/luci-app-unblockneteasemusic/root/usr/share/unblockneteasemusic/update_core.sh @@ -16,7 +16,7 @@ function clean_log(){ } function check_latest_version(){ - latest_ver="$(curl -s https://github.com/nondanee/UnblockNeteaseMusic/commits/master |tr '\n' ' ' | grep -Eo 'commit\/[0-9a-z]+' |sed -n 1p |sed 's#commit/##g')" + latest_ver="$(curl -s https://github.com/nondanee/UnblockNeteaseMusic/commits/master |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/unblockneteasemusic.log && exit 1 if [ ! -e "/usr/share/unblockneteasemusic/local_ver" ]; then clean_log @@ -64,4 +64,4 @@ function main(){ check_latest_version } -main \ No newline at end of file +main