From 201ec21adf3b926b06ba518002edbf20a2e655ab Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 17 Nov 2024 15:14:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96Dev=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=9C=80=E6=96=B0=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- update | 31 ++++++++++++++++++++++++------- 1 file changed, 24 insertions(+), 7 deletions(-) diff --git a/update b/update index 27e680ba..03c8cba0 100644 --- a/update +++ b/update @@ -74,11 +74,28 @@ function install_backend_and_download_resources() { return 1 fi INFO "安装依赖成功" - # 从后端文件中读取前端版本号 - frontend_version=$(sed -n "s/^FRONTEND_VERSION\s*=\s*'\([^']*\)'/\1/p" ${TMP_PATH}/App/version.py) - if [[ "${frontend_version}" != *v* ]]; then - WARN "前端最新版本号获取失败,继续启动..." - return 1 + # 如果是"heads/v2.zip",则查找v2开头的最新版本号 + if [[ "${1}" == "heads/v2.zip" ]]; then + INFO "正在获取前端最新版本号..." + # 获取所有发布的版本列表,并筛选出以v2开头的版本号 + releases=$(curl ${CURL_OPTIONS} "https://api.github.com/repos/jxxghp/MoviePilot-Frontend/releases" ${CURL_HEADERS} | jq -r '.[].tag_name' | grep "^v2\.") + if [ -z "$releases" ]; then + WARN "未找到任何v2前端版本,继续启动..." + return 1 + else + # 找到最新的v2版本 + frontend_version=$(echo "$releases" | sort -V | tail -n 1) + fi + INFO "前端最新版本号:${frontend_version}" + else + INFO "正在获取前端版本号..." + # 从后端文件中读取前端版本号 + frontend_version=$(sed -n "s/^FRONTEND_VERSION\s*=\s*'\([^']*\)'/\1/p" ${TMP_PATH}/App/version.py) + if [[ "${frontend_version}" != *v* ]]; then + WARN "前端版本号获取失败,继续启动..." + return 1 + fi + INFO "前端版本号:${frontend_version}" fi # 更新前端程序 if ! download_and_unzip "${GITHUB_PROXY}https://github.com/jxxghp/MoviePilot-Frontend/releases/download/${frontend_version}/dist.zip" "dist"; then @@ -295,11 +312,11 @@ if [[ "${MOVIEPILOT_AUTO_UPDATE}" = "true" ]] || [[ "${MOVIEPILOT_AUTO_UPDATE}" # 获取所有发布的版本列表,并筛选出以v2开头的版本号 releases=$(curl ${CURL_OPTIONS} "https://api.github.com/repos/jxxghp/MoviePilot/releases" ${CURL_HEADERS} | jq -r '.[].tag_name' | grep "^v2\.") if [ -z "$releases" ]; then - WARN "未找到任何v2.x版本,继续启动..." + WARN "未找到任何v2后端版本,继续启动..." else # 找到最新的v2版本 latest_v2=$(echo "$releases" | sort -V | tail -n 1) - INFO "最新的v2.x版本号:${latest_v2}" + INFO "最新的v2后端版本号:${latest_v2}" # 使用版本号比较函数进行比较,并下载最新版本 compare_versions "${current_version}" "${latest_v2}" fi