Merge pull request #5424 from AuxXxilium/dev

build: update more

.github/workflows/build.yml

@@ -96,7 +96,6 @@ jobs:
           getTheme "files/p1/boot/grub"
           getBuildrootx "brx" 
           getBuildroots "brs"
-          cp -f "files/initrd/opt/arc/grub.img.gz" "grub.img.gz"
 
           # Export Dependencies Version to env
           echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
@@ -131,8 +130,7 @@ jobs:
 
           echo "Create Arc Image"
           IMAGE_FILE="arc.img"
-          cp -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
-          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)
@@ -213,8 +211,7 @@ jobs:
 
           echo "Create Arc Image"
           IMAGE_FILE="arc.img"
-          cp -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
-          gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+          gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
           fdisk -l "${IMAGE_FILE}"
           
           LOOPX=$(sudo losetup -f)

.github/workflows/grub.yml

@@ -33,15 +33,13 @@ jobs:
 
       - name: Make Grub
         run: |
+          rm -f grub.img.gz
           . scripts/grub.sh "grub-2.12" "i386-pc i386-efi x86_64-efi"
 
       - name: Check and Push
         if: success() && inputs.push == true
         run: |
           if [ -f "grub.img.gz" ]; then
-            echo "Copy img ..."
-            mv -f grub.img.gz files/initrd/opt/arc/grub.img.gz
-
             echo "Git push ..."
             git pull
             status=$(git status -s | grep -E 'grub.img.gz' | awk '{printf " %s", $2}')

img-gen-n.sh

@@ -26,7 +26,7 @@ mkdir -p "brx"
 
 # Sbase
 IMAGE_FILE="arc.img"
-gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)

img-gen-s.sh

@@ -25,7 +25,7 @@ getOffline "files/p3/configs"
 
 # Sbase
 IMAGE_FILE="arc.img"
-gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}"
+gzip -dc "grub.img.gz" >"${IMAGE_FILE}"
 fdisk -l "${IMAGE_FILE}"
 
 LOOPX=$(sudo losetup -f)

scripts/func.sh

@@ -503,8 +503,9 @@ function copyBuildroot() {
 
 # create arc executable
 function createArc() {
-  [ ! -f "arc" ] && ./scripts/make/makeself.sh --current --zstd --quiet "../arc/files/initrd/opt/arc" arc "Arc Loader" "./init.sh" || true
-  rm -rf "../arc/files/initrd/opt/arc"
-  mkdir -p "../arc/files/initrd/opt/arc"
-  cp -f "arc" "../arc/files/initrd/opt/arc/"
+  [ ! -f "arc" ] && ./scripts/make/makeself.sh --current --zstd "files/initrd/opt/arc" arc "Arc Loader" "./init.sh" || true
+  rm -rf "files/initrd/opt/arc"
+  mkdir -p "files/initrd/opt/arc"
+  cp -f "arc" "files/initrd/opt/arc/"
+  cp -f "grub.img.gz" "files/initrd/opt/arc/grub.img.gz"
 }