From c442175cfb745c4176615ccabf0a878093fb0530 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Wed, 5 Feb 2025 17:41:13 +0100
Subject: [PATCH] build: update

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 .github/workflows/build.yml |  2 +-
 .github/workflows/data.yml  | 53 ++++++++++++++++++++++++++-----------
 2 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c381b6a8..3106fe15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -104,7 +104,7 @@ jobs:
        # Build incremental
       - name: Build Image
         run: |
-          . scripts/func.sh
+          . scripts/functions.sh
 
           # Modify Source File
           ARC_BUILD="$(date +'%y%m%d')"
diff --git a/.github/workflows/data.yml b/.github/workflows/data.yml
index 4b0d0d41..18649274 100644
--- a/.github/workflows/data.yml
+++ b/.github/workflows/data.yml
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2025 AuxXxilium <https://github.com/AuxXxilium>
+# Copyright (C) 2023 AuxXxilium <https://github.com/AuxXxilium> and Ing <https://github.com/wjz304>
 #
 # This is free software, licensed under the MIT License.
 # See /LICENSE for more information.
@@ -34,43 +34,66 @@ jobs:
           sudo timedatectl set-timezone "Europe/Berlin"
 
           sudo apt update
-          sudo apt install -y build-essential libtool pkgconf libzstd-dev liblzma-dev libssl-dev  # kmodule dependencies
+          sudo apt install -y build-essential libtool pkgconf libzstd-dev liblzma-dev libssl-dev busybox dialog curl xz-utils cpio sed qemu-utils
 
-      - name: Get Release Data for Arc
+          YQ=$(command -v yq)
+          if [ -z "${YQ}" ] || ! ${YQ} --version 2>/dev/null | grep -q "v4."; then
+            wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O "${YQ:-"/usr/bin/yq"}" && chmod +x "${YQ:-"/usr/bin/yq"}"
+          fi
+
+      - name: Get Addon Data for Arc
         run: |
-          REPO="${{ github.server_url }}/${{ github.repository }}"
+          REPO="https://github.com/AuxXxilium/arc-addons"
           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)"
+            TAG="$(curl -skL --connect-timeout 10 "${REPO}/tags" | grep /refs/tags/.*\.zip  | sed -r '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 arc-${TAG}.img.zip
-          STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/arc-${TAG}.img.zip" -o "arc-${TAG}.img.zip")
+          rm -f addons.zip
+          STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/addons-${TAG}.zip" -o "addons.zip")
           if [ $? -ne 0 -o ${STATUS:-0} -ne 200 ]; then
             echo "Download failed"
             exit 1
           fi
           
-          unzip arc-${TAG}.img.zip -d "arc"
+          mkdir -p "mnt/p3/addons"
+          unzip addons.zip -d "mnt/p3/addons"
+          for i in $(find "mnt/p3/addons" -type f -name "*.addon"); do
+            if [ -f "${i}" ]; then
+              mkdir -p "mnt/p3/addons/$(basename "${i}" .addon)"
+              tar -xaf "${i}" -C "mnt/p3/addons/$(basename "${i}" .addon)"
+            fi
+          done
+          rm -f addons.zip
 
-          sudo ./localbuild.sh create arc/ws arc/arc.img
-          if [ $? -ne 0 ]; then
-            echo "create failed"
+      - name: Get Config Data for Arc
+        run: |
+          REPO="https://github.com/AuxXxilium/arc-configs"
+          LATESTURL="$(curl -skL --connect-timeout 10 -w %{url_effective} -o /dev/null "${REPO}/releases/latest")"
+          TAG="${LATESTURL##*/}"
+          [ "${TAG:0:1}" = "v" ] && TAG="${TAG:1}"
+          rm -f configs.zip
+          STATUS=$(curl -kL --connect-timeout 10 -w "%{http_code}" "${REPO}/releases/download/${TAG}/configs-${TAG}.zip" -o "configs.zip")
+          if [ $? -ne 0 -o ${STATUS:-0} -ne 200 ]; then
+            echo "Download failed"
             exit 1
           fi
+          
+          mkdir -p "mnt/p3/configs"
+          unzip configs.zip -d "mnt/p3/configs"
+          rm -f configs.zip
 
       - name: Get data
         run: |
           pip install -r scripts/requirements.txt
-          python scripts/functions.py getmodels -j "docs/models.json"
-          python scripts/functions.py getaddons -j "docs/addons.json"
-          python scripts/functions.py getmodules -j "docs/modules.json"
-          python scripts/functions.py getpats -j "docs/pats.json"
+          python scripts/functions.py getmodels -w "." -j "docs/models.json"
+          python scripts/functions.py getaddons -w "." -j "docs/addons.json"
+          python scripts/functions.py getpats -w "." -j "docs/pats.json"
 
       - name: Upload to Artifacts
         if: success()