From e9463d990ee470d74cf9d40c1ca48767e6adb25d Mon Sep 17 00:00:00 2001 From: AuxXxilium Date: Fri, 27 Dec 2024 23:15:58 +0100 Subject: [PATCH] tree: update Signed-off-by: AuxXxilium --- .github/workflows/autobuild.yml | 4 ++-- .github/workflows/build.yml | 4 ++-- .github/workflows/grub.yml | 3 +++ grub.img.gz => files/initrd/opt/arc/grub.img.gz | Bin img-gen-n.sh | 2 +- img-gen-s.sh | 2 +- scripts/func.sh | 3 +-- 7 files changed, 10 insertions(+), 8 deletions(-) rename grub.img.gz => files/initrd/opt/arc/grub.img.gz (100%) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index db527bcc..e7eb0838 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -104,7 +104,7 @@ jobs: echo "Create Arc Image" IMAGE_FILE="arc.img" - gzip -dc "grub.img.gz" >"${IMAGE_FILE}" + gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" LOOPX=$(sudo losetup -f) @@ -185,7 +185,7 @@ jobs: echo "Create Arc Image" IMAGE_FILE="arc.img" - gzip -dc "grub.img.gz" >"${IMAGE_FILE}" + gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" LOOPX=$(sudo losetup -f) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 911fa66c..b0fb423c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -130,7 +130,7 @@ jobs: echo "Create Arc Image" IMAGE_FILE="arc.img" - gzip -dc "grub.img.gz" >"${IMAGE_FILE}" + gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" LOOPX=$(sudo losetup -f) @@ -210,7 +210,7 @@ jobs: echo "Create Arc Image" IMAGE_FILE="arc.img" - gzip -dc "grub.img.gz" >"${IMAGE_FILE}" + gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" LOOPX=$(sudo losetup -f) diff --git a/.github/workflows/grub.yml b/.github/workflows/grub.yml index d1b2e072..f39e1b07 100644 --- a/.github/workflows/grub.yml +++ b/.github/workflows/grub.yml @@ -39,6 +39,9 @@ jobs: 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}') diff --git a/grub.img.gz b/files/initrd/opt/arc/grub.img.gz similarity index 100% rename from grub.img.gz rename to files/initrd/opt/arc/grub.img.gz diff --git a/img-gen-n.sh b/img-gen-n.sh index e3ecdb01..65fdf6d0 100755 --- a/img-gen-n.sh +++ b/img-gen-n.sh @@ -22,7 +22,7 @@ mkdir -p "brx" # Sbase IMAGE_FILE="arc.img" -gzip -dc "./grub.img.gz" >"${IMAGE_FILE}" +gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" LOOPX=$(sudo losetup -f) diff --git a/img-gen-s.sh b/img-gen-s.sh index 87965c12..ff140a8c 100755 --- a/img-gen-s.sh +++ b/img-gen-s.sh @@ -21,7 +21,7 @@ getOffline "files/p3/configs" # Sbase IMAGE_FILE="arc.img" -gzip -dc "./grub.img.gz" >"${IMAGE_FILE}" +gzip -dc "files/initrd/opt/arc/grub.img.gz" >"${IMAGE_FILE}" fdisk -l "${IMAGE_FILE}" LOOPX=$(sudo losetup -f) diff --git a/scripts/func.sh b/scripts/func.sh index feb001bb..4df5971d 100755 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -503,9 +503,8 @@ function copyBuildroot() { # create arc executable function createArc() { - ./scripts/make/makeself.sh --current --keep --zstd --chown --threads=0 --quiet --noexec --notemp ../arc/files/initrd/opt/arc arc "Arc Loader" init.sh + ./scripts/make/makeself.sh --current --zstd --chown --threads=0 --quiet ../arc/files/initrd/opt/arc arc "Arc Loader" init.sh rm -rf "../arc/files/initrd/opt/arc" mkdir -p "../arc/files/initrd/opt/arc" mv -f "arc" "../arc/files/initrd/opt/arc/" - cp -f "./grub.img.gz" "files/initrd/opt/arc/grub.img.gz" } \ No newline at end of file