From b488a46e6a427297041b27d64ba8f1b14e7be529 Mon Sep 17 00:00:00 2001
From: moruiris <53965900+moruiris@users.noreply.github.com>
Date: Sun, 17 Oct 2021 13:34:25 +0800
Subject: [PATCH] Update immortalwrt_R3P_open-wifi.yml

---
 .github/workflows/immortalwrt_R3P_open-wifi.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/immortalwrt_R3P_open-wifi.yml b/.github/workflows/immortalwrt_R3P_open-wifi.yml
index 30f00ae..1ee68ef 100644
--- a/.github/workflows/immortalwrt_R3P_open-wifi.yml
+++ b/.github/workflows/immortalwrt_R3P_open-wifi.yml
@@ -22,6 +22,7 @@ env:
   UPLOAD_FIRMWARE: true
   UPLOAD_RELEASE: true
   TZ: Asia/Shanghai
+  OPENWRT_NAME: immortalwrt
   WIFI_NAME: open-wifi
   
 jobs:
@@ -106,17 +107,19 @@ jobs:
       if: (!cancelled())
       run: df -hT
 
-    - name: UPLOAD_FIRMWARE 整理文件
+    - name: 整理文件并重命名
       id: organize
       if: env.UPLOAD_FIRMWARE == 'true' && !cancelled()
       run: | 
         mkdir firmware && find openwrt/bin/targets/*/*/ -maxdepth 1 \
-        -name "*combined*" \
-        -or -name "*factory*" \
+        -name "*factory*" \
         -or -name "*sysupgrade*" \
+        -or -name "*combined*" \
         | xargs -i mv -f {} ./firmware/
-        cp openwrt/.config  ./firmware/${{ env.date1 }}_${{ env.DEVICE_NAME }}_${{ env.WIFI_NAME }}.config
+        cp openwrt/.config  ./firmware/${{ env.date1 }}_${{ env.WIFI_NAME }}_${{ env.OPENWRT_NAME }}_${{ env.DEVICE_NAME }}.config
         cd firmware
+        sudo -E apt-get -qq install rename
+        rename 's/^/${{ env.date1 }}_${{ env.WIFI_NAME }}_/' *.bin
         echo "FIRMWARE=$PWD" >> $GITHUB_ENV
         echo "::set-output name=status::success"
       
@@ -124,10 +127,10 @@ jobs:
       uses: actions/upload-artifact@main
       if: steps.organize.outputs.status == 'success' && !cancelled()
       with:
-        name: ${{ env.date1 }}_${{ env.DEVICE_NAME }}_${{ env.WIFI_NAME }}
+        name: ${{ env.date1 }}_${{ env.WIFI_NAME }}_${{ env.OPENWRT_NAME }}_${{ env.DEVICE_NAME }}
         path: ${{ env.FIRMWARE }}
 
-    - name: UPLOAD_RELEASE 生成发布标签
+    - name: 生成release标签
       id: tag
       if: env.UPLOAD_RELEASE == 'true' && !cancelled()
       run: |