From d49a7e2bc4b852d86dd5e222f3625729bd554d0a Mon Sep 17 00:00:00 2001
From: LIRUI <298977887@qq.com>
Date: Mon, 28 Oct 2024 18:37:33 +0800
Subject: [PATCH] 1028.2

---
 .github/workflows/CCC.yml | 29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/CCC.yml b/.github/workflows/CCC.yml
index 6009056..018ef87 100644
--- a/.github/workflows/CCC.yml
+++ b/.github/workflows/CCC.yml
@@ -84,12 +84,28 @@ jobs:
               echo "仓库克隆成功！"
           fi
 
+      # 5. 获取固件版本 - 检索当前固件的版本信息
+      - name: 📦 获取固件版本 - 检索当前固件的版本信息
+        run: |
+          cd lede
+          grep '"DISTRIB_REVISION=' */*/default-settings/files/zzz-default-settings | cut -d"'" -f2
+
+          # 获取 DISTRIB_REVISION 值
+          DISTRIB_REVISION=$(grep '"DISTRIB_REVISION=' */*/default-settings/files/zzz-default-settings | cut -d"'" -f2)
+
+          # 将值设置为环境变量
+          echo "distrib_revision=$DISTRIB_REVISION" >> $GITHUB_ENV
+
+          # 在日志中显示 DISTRIB_REVISION 的值
+          echo "DISTRIB_REVISION: $DISTRIB_REVISION"   
+
       # 5. 获取内核主版本号
       - name: 📄 获取内核主版本号
         run: |
           KERNEL_PATCHVER=$(grep "KERNEL_PATCHVER" lede/target/linux/x86/Makefile | awk -F ':=' '{print $2}' | xargs)
           echo "KERNEL_PATCHVER=$KERNEL_PATCHVER" >> $GITHUB_ENV
           echo "内核主版本号：$KERNEL_PATCHVER"
+          #输出示例：内核主版本号：6.6
 
       # 6. 获取完整内核版本
       - name: 📄 获取完整内核版本
@@ -99,6 +115,7 @@ jobs:
               FULL_KERNEL_VERSION="$KERNEL_PATCHVER$PATCH_VERSION"
               echo "FULL_KERNEL_VERSION=$FULL_KERNEL_VERSION" >> $GITHUB_ENV
               echo "完整的内核版本为：$FULL_KERNEL_VERSION"
+              #输出示例：完整的内核版本为：6.6.58
           else
               echo "未找到对应的内核版本文件 lede/include/kernel-$KERNEL_PATCHVER"
               exit 1
@@ -119,9 +136,12 @@ jobs:
           cd lede/feeds/luci
           LUCI_BRANCH=$(git rev-parse --abbrev-ref HEAD)
           LUCI_COMMIT=$(git rev-parse --short HEAD)
-          LUCI_VERSION="LuCI $LUCI_BRANCH branch (git-$LUCI_COMMIT)"
+          
+          # 格式化 LuCI 版本信息，将空格替换为下划线，并构建为目标格式
+          LUCI_VERSION="LuCI_${LUCI_BRANCH}_branch_(git--${LUCI_COMMIT})"
           echo "LUCI_VERSION=$LUCI_VERSION" >> $GITHUB_ENV
           echo "LuCI 版本信息：$LUCI_VERSION"
+          # 输出示例：LuCI_openwrt-23.05_branch_(git--4f71ba2)
 
       # 更新 README.md 文件
       - name: ✏️ 更新 README.md 文件
@@ -130,14 +150,15 @@ jobs:
           LUCI_VERSION: "${{ env.LUCI_VERSION }}"
         run: |
           # 生成要插入的新内容
-          LATEST_VERSION="R$(date +'%y.%m.%d')-$(date +'%H%M')"
+          LATEST_VERSION="R$(date +'%y.%m.%d')--$(date +'%H%M')"
           ARCHITECTURE="x86_64"
           FILE_SIZE="1024MB"
-          RELEASE_DATE="$(date +'%Y-%m-%d')"
+          RELEASE_DATE="$(date +'%Y--%m--%d')"
           OPENWRT_VERSION="${FULL_KERNEL_VERSION}"
+          DISTRIB_REVISION="${{ env.distrib_revision }}"
 
           NEW_CONTENT="<!--action-tag-start-->\n\n"
-          NEW_CONTENT+="![Latest Version](https://img.shields.io/badge/固件版本-${LATEST_VERSION}-brightgreen)\n"
+          NEW_CONTENT+="![Latest Version](https://img.shields.io/badge/固件版本-${DISTRIB_REVISION}-brightgreen)\n"
           NEW_CONTENT+="![Based on OpenWrt](https://img.shields.io/badge/OpenWrt版本-${OPENWRT_VERSION}-00bfff)\n"
           NEW_CONTENT+="![Architecture](https://img.shields.io/badge/适用架构-${ARCHITECTURE}-ff69b4)\n"
           NEW_CONTENT+="![File Size](https://img.shields.io/badge/文件大小-${FILE_SIZE}-orange)\n"