.github/workflows/data.yml

@@ -1,109 +1,108 @@
-#
-# Copyright (C) 2022 Ing <https://github.com/wjz304>
-#
-# This is free software, licensed under the MIT License.
-# See /LICENSE for more information.
-#
-
-name: Data
-on:
-  release:
-    types:
-      - created
-
-  workflow_dispatch:
-    inputs:
-      push:
-        description: "push"
-        default: false
-        type: boolean
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@main
-        with:
-          ref: main
-
-      - name: Init Env
-        run: |
-          git config --global user.email "github-actions[bot]@users.noreply.github.com"
-          git config --global user.name "github-actions[bot]"
-          sudo timedatectl set-timezone "Asia/Shanghai"
-
-      - name: Delay
-        run: |
-          echo "Delaying for 1 minutes..."
-          sleep 60
-
-      - name: Get Release RR
-        run: |
-          REPO="${{ github.server_url }}/${{ github.repository }}"
-          PRERELEASE="true"
-
-          TAG=""
-          if [ "${PRERELEASE}" = "true" ]; then
-            TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)"
-          else
-            LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${REPO}/releases/latest")"
-            TAG="${LATESTURL##*/}"
-          fi
-          [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}"
-          rm -f rr-${TAG}.img.zip
-          STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/rr-${TAG}.img.zip" -o "rr-${TAG}.img.zip")
-          if [ $? -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then
-            echo "Download failed"
-            exit 1
-          fi
-
-          unzip rr-${TAG}.img.zip -d "rr"
-
-          export TERM=xterm
-
-          sudo ./localbuild.sh create rr/ws rr/rr.img
-          if [ $? -ne 0 ]; then
-            echo "create failed"
-            exit 1
-          fi
-
-      - name: Get data
-        run: |
-          sudo apt update
-          sudo apt install -y locales busybox dialog gettext sed gawk jq curl 
-          sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils cpio xz-utils lz4 lzma bzip2 gzip zstd
-          sudo apt install -y build-essential libtool pkgconf libzstd-dev liblzma-dev libssl-dev  # kmodule dependencies
-
-          # Backup the original python3 executable.
-          sudo mv -f "$(realpath $(which python3))/EXTERNALLY-MANAGED" "$(realpath $(which python3))/EXTERNALLY-MANAGED.bak" 2>/dev/null || true
-          sudo pip3 install -U -r scripts/requirements.txt
-
-          python3 scripts/func.py getmodels -w "rr/ws/initrd" -j "docs/models.json" -x "docs/models.xlsx"
-          python3 scripts/func.py getaddons -w "rr/ws" -j "docs/addons.json" -x "docs/addons.xlsx"
-          python3 scripts/func.py getmodules -w "rr/ws" -j "docs/modules.json" -x "docs/modules.xlsx"
-
-          python3 scripts/func.py getpats -w "rr/ws/initrd" -j "docs/pats.json" -x "docs/pats.xlsx"
-
-      - name: Upload to Artifacts
-        if: success()
-        uses: actions/upload-artifact@v4
-        with:
-          name: docs
-          path: |
-            docs/*.json
-            docs/*.xlsx
-          retention-days: 5
-
-      - name: Check and Push
-        if: success() && (inputs.push == true || github.event.action == 'created')
-        run: |
-            echo "Git push ..."
-            # git checkout main
-            git pull
-            status=$(git status -s | grep -E "docs" | awk '{printf " %s", $2}')
-            if [ -n "${status}" ]; then
-              git add ${status}
-              git commit -m "update $(date +%Y-%m-%d" "%H:%M:%S)"
-              git push -f
-            fi
+#
+# Copyright (C) 2022 Ing <https://github.com/wjz304>
+#
+# This is free software, licensed under the MIT License.
+# See /LICENSE for more information.
+#
+
+name: Data
+on:
+  release:
+    types:
+      - created
+
+  workflow_dispatch:
+    inputs:
+      push:
+        description: "push"
+        default: false
+        type: boolean
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@main
+        with:
+          ref: main
+
+      - name: Init Env
+        run: |
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git config --global user.name "github-actions[bot]"
+          sudo timedatectl set-timezone "Asia/Shanghai"
+
+      - name: Delay
+        run: |
+          echo "Delaying for 1 minutes..."
+          sleep 60
+
+      - name: Get Release RR
+        run: |
+          REPO="${{ github.server_url }}/${{ github.repository }}"
+          PRERELEASE="true"
+
+          TAG=""
+          if [ "${PRERELEASE}" = "true" ]; then
+            TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)"
+          else
+            TAG="$(curl -skL --connect-timeout 10 -w "%{url_effective}" -o /dev/null "${REPO}/releases/latest" | awk -F'/' '{print $NF}')"
+          fi
+          [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}"
+          rm -f rr-${TAG}.img.zip
+          STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/rr-${TAG}.img.zip" -o "rr-${TAG}.img.zip")
+          if [ $? -ne 0 ] || [ ${STATUS:-0} -ne 200 ]; then
+            echo "Download failed"
+            exit 1
+          fi
+
+          unzip rr-${TAG}.img.zip -d "rr"
+
+          export TERM=xterm
+
+          sudo ./localbuild.sh create rr/ws rr/rr.img
+          if [ $? -ne 0 ]; then
+            echo "create failed"
+            exit 1
+          fi
+
+      - name: Get data
+        run: |
+          sudo apt update
+          sudo apt install -y locales busybox dialog gettext sed gawk jq curl 
+          sudo apt install -y python-is-python3 python3-pip libelf-dev qemu-utils cpio xz-utils lz4 lzma bzip2 gzip zstd
+          sudo apt install -y build-essential libtool pkgconf libzstd-dev liblzma-dev libssl-dev  # kmodule dependencies
+
+          # Backup the original python3 executable.
+          sudo mv -f "$(realpath $(which python3))/EXTERNALLY-MANAGED" "$(realpath $(which python3))/EXTERNALLY-MANAGED.bak" 2>/dev/null || true
+          sudo pip3 install -U -r scripts/requirements.txt
+
+          python3 scripts/func.py getmodels -w "rr/ws/initrd" -j "docs/models.json" -x "docs/models.xlsx"
+          python3 scripts/func.py getaddons -w "rr/ws" -j "docs/addons.json" -x "docs/addons.xlsx"
+          python3 scripts/func.py getmodules -w "rr/ws" -j "docs/modules.json" -x "docs/modules.xlsx"
+
+          python3 scripts/func.py getpats -w "rr/ws/initrd" -j "docs/pats.json" -x "docs/pats.xlsx"
+
+      - name: Upload to Artifacts
+        if: success()
+        uses: actions/upload-artifact@v4
+        with:
+          name: docs
+          path: |
+            docs/*.json
+            docs/*.xlsx
+          retention-days: 5
+
+      - name: Check and Push
+        if: success() && (inputs.push == true || github.event.action == 'created')
+        run: |
+            echo "Git push ..."
+            # git checkout main
+            git pull
+            status=$(git status -s | grep -E "docs" | awk '{printf " %s", $2}')
+            if [ -n "${status}" ]; then
+              git add ${status}
+              git commit -m "update $(date +%Y-%m-%d" "%H:%M:%S)"
+              git push -f
+            fi

.github/workflows/issues.yml

@@ -159,20 +159,23 @@ jobs:
           }
 
           function readConfigKey() {
-            local result=$(sudo yq eval ".${1} | explode(.)" "${2}" 2>/dev/null)
+            local result
+            result=$(sudo yq eval ".${1} | explode(.)" "${2}" 2>/dev/null)
             [ "${result}" = "null" ] && echo "" || echo "${result}"
           }
 
           function mergeConfigModules() {
             # Error: bad file '-': cannot index array with '8139cp' (strconv.ParseInt: parsing "8139cp": invalid syntax)
             # When the first key is a pure number, yq will not process it as a string by default. The current solution is to insert a placeholder key.
-            local MS="RRORG\n${1// /\\n}"
-            local L="$(echo -en "${MS}" | awk '{print "modules."$1":"}')"
-            local xmlfile=$(mktemp)
-            echo -en "${L}" | sudo yq -p p -o y >"${xmlfile}"
-            deleteConfigKey "modules.\"RRORG\"" "${xmlfile}"
-            sudo yq eval-all --inplace '. as $item ireduce ({}; . * $item)' --inplace "${2}" "${xmlfile}" 2>/dev/null
-            rm -f "${xmlfile}"
+            local MS ML XF
+            MS="RRORG\n${1// /\\n}"
+            ML="$(echo -en "${MS}" | awk '{print "modules."$1":"}')"
+            XF=$(mktemp 2>/dev/null)
+            XF=${XF:-/tmp/tmp.XXXXXXXXXX}
+            echo -en "${ML}" | sudo yq -p p -o y >"${XF}"
+            deleteConfigKey "modules.\"RRORG\"" "${XF}"
+            sudo yq eval-all --inplace '. as $item ireduce ({}; . * $item)' --inplace "${2}" "${XF}" 2>/dev/null
+            rm -f "${XF}"
           }
 
           REPO="${{ github.server_url }}/${{ github.repository }}"
@@ -184,8 +187,7 @@ jobs:
           if [ "${PRERELEASE}" = "true" ]; then
             TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep "/refs/tags/.*\.zip" | sed -E 's/.*\/refs\/tags\/(.*)\.zip.*$/\1/' | sort -rV | head -1)"
           else
-            LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${REPO}/releases/latest")"
-            TAG="${LATESTURL##*/}"
+            TAG="$(curl -skL --connect-timeout 10 -w "%{url_effective}" -o /dev/null "${REPO}/releases/latest" | awk -F'/' '{print $NF}')"
           fi
           [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}"
           rm -f rr-${TAG}.img.zip
@@ -266,7 +268,7 @@ jobs:
           USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml"
           {
             echo "RR: "
-            echo "  VERSION: $(cat ${RR_VERSION_FILE} 2>/dev/null | head -1)"
+            echo "  VERSION: $(cat "${RR_VERSION_FILE}" 2>/dev/null | head -1)"
             echo "  CUSTOM:  ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
             echo
             echo "DSM:"
@@ -284,33 +286,33 @@ jobs:
           if [ "${{ env.format }}" = "ova" ]; then
             . scripts/func.sh "${{ secrets.RRORG }}"
             convertova "rr/rr.img" "rr/rr.ova"
-            (cd rr; sha256sum rr.ova >../sha256sum)
+            (cd rr && sha256sum rr.ova >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.ova.zip" -j rr/rr.ova ${USER_CONFIG_FILE} sha256sum README.txt
           elif [ "${{ env.format }}" = "vmx" ]; then
             . scripts/func.sh "${{ secrets.RRORG }}"
             convertvmx "rr/rr.img" "rr.vmx"  # rr.vmx is a directory
-            (cd rr.vmx; sha256sum * >../sha256sum)
+            (cd rr.vmx && sha256sum * >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmx.zip" -r rr.vmx ${USER_CONFIG_FILE} sha256sum README.txt
           elif [ "${{ env.format }}" = "vmdk" ]; then
             qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' rr/rr.vmdk
-            (cd rr; sha256sum rr.vmdk >../sha256sum)
+            (cd rr && sha256sum rr.vmdk >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk ${USER_CONFIG_FILE} sha256sum README.txt
           elif [ "${{ env.format }}" = "flat" ]; then
             qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=monolithicFlat,compat6' rr/rr.vmdk
-            (cd rr; sha256sum rr*.vmdk >../sha256sum)
+            (cd rr && sha256sum rr*.vmdk >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.flat.zip" -j rr/rr*.vmdk ${USER_CONFIG_FILE} sha256sum README.txt
           elif [ "${{ env.format }}" = "vhd" ]; then
             . scripts/func.sh "${{ secrets.RRORG }}"
             qemu-img convert rr/rr.img -O vpc rr/rr.vhd
             createvmc "rr/rr.vhd" "rr/rr.vmc"
-            (cd rr; sha256sum rr.vhd >../sha256sum)
+            (cd rr && sha256sum rr.vhd >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vhd.zip" -j rr/rr.vmc rr/rr.vhd ${USER_CONFIG_FILE} sha256sum README.txt
           elif [ "${{ env.format }}" = "vhdx" ]; then
             qemu-img convert rr/rr.img -O vhdx -o subformat=dynamic rr/rr.vhdx
-            (cd rr; sha256sum rr.vhdx >../sha256sum)
+            (cd rr && sha256sum rr.vhdx >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vhdx.zip" -j rr/rr.vhdx ${USER_CONFIG_FILE} sha256sum README.txt
           else
-            (cd rr; sha256sum rr.img >../sha256sum)
+            (cd rr && sha256sum rr.img >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.img.zip" -j rr/rr.img ${USER_CONFIG_FILE} sha256sum README.txt
           fi
 
@@ -361,4 +363,4 @@ jobs:
             RR-${{ env.model }} build failed, please try again.  
             > ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}  
             ----
-          emoji: confused
+          emoji: confused

.gitignore

@@ -10,6 +10,7 @@ rr*.vmdk
 **.po~
 **.mo
 
+downloads.md
 tests
 Changelog*
 sha256sum

VERSION

@@ -1 +1 @@
-25.1.4
+25.3.1