From bf7c53bc4da307bde50b2890e54201f645a58288 Mon Sep 17 00:00:00 2001
From: AuxXxilium <info@auxxxilium.tech>
Date: Thu, 5 Sep 2024 17:36:39 +0200
Subject: [PATCH] tree: fix branch system

Signed-off-by: AuxXxilium <info@auxxxilium.tech>
---
 .github/workflows/autobuild.yml        | 4 ++--
 .github/workflows/build.yml            | 4 ++--
 files/initrd/opt/arc/include/consts.sh | 1 -
 files/initrd/opt/arc/include/update.sh | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
index ee7dfef9..79a039ea 100644
--- a/.github/workflows/autobuild.yml
+++ b/.github/workflows/autobuild.yml
@@ -129,7 +129,7 @@ jobs:
           convertova "${IMAGE_FILE}" "arc.ova"
 
           # Zip update and generate checksum
-          zip -9j update.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg"
+          zip -9j update.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/ARC-BRANCH" "files/p1/boot/grub/grub.cfg"
           sha256sum update.zip >checksum.sha256
 
       # Build incremental
@@ -187,7 +187,7 @@ jobs:
           convertova "${IMAGE_FILE}" "arc-next.ova"
 
           # Zip update and generate checksum
-          zip -9j update-next.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg"
+          zip -9j update-next.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/ARC-BRANCH" "files/p1/boot/grub/grub.cfg"
           sha256sum update-next.zip >checksum-next.sha256
 
       # Zip image and generate checksum
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 6ae912e9..7b7d2c0c 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -167,7 +167,7 @@ jobs:
           convertova "${IMAGE_FILE}" "arc.ova"
 
           # Zip update and generate checksum
-          zip -9j update.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg"
+          zip -9j update.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/ARC-BRANCH" "files/p1/boot/grub/grub.cfg"
           sha256sum update.zip >checksum.sha256
 
       # Build incremental
@@ -225,7 +225,7 @@ jobs:
           convertova "${IMAGE_FILE}" "arc-next.ova"
 
           # Zip update and generate checksum
-          zip -9j update-next.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/boot/grub/grub.cfg"
+          zip -9j update-next.zip "files/p3/bzImage-arc" "files/p3/initrd-arc" "files/p1/ARC-VERSION" "files/p1/ARC-BRANCH" "files/p1/boot/grub/grub.cfg"
           sha256sum update-next.zip >checksum-next.sha256
 
       # Zip image and generate checksum
diff --git a/files/initrd/opt/arc/include/consts.sh b/files/initrd/opt/arc/include/consts.sh
index f636ceaa..12e3fa9d 100755
--- a/files/initrd/opt/arc/include/consts.sh
+++ b/files/initrd/opt/arc/include/consts.sh
@@ -18,7 +18,6 @@ GRUB_PATH="${PART1_PATH}/boot/grub"
 
 ORI_ZIMAGE_FILE="${PART2_PATH}/zImage"
 ORI_RDGZ_FILE="${PART2_PATH}/rd.gz"
-
 ARC_BZIMAGE_FILE="${PART3_PATH}/bzImage-arc"
 ARC_RAMDISK_FILE="${PART3_PATH}/initrd-arc"
 MOD_ZIMAGE_FILE="${PART3_PATH}/zImage-dsm"
diff --git a/files/initrd/opt/arc/include/update.sh b/files/initrd/opt/arc/include/update.sh
index 8f018be5..432200b2 100755
--- a/files/initrd/opt/arc/include/update.sh
+++ b/files/initrd/opt/arc/include/update.sh
@@ -175,6 +175,7 @@ function updateLoader() {
           echo "Installing new Loader Image..."
           mv -f "${TMP_PATH}/grub.cfg" "${USER_GRUB_CONFIG}"
           mv -f "${TMP_PATH}/ARC-VERSION" "${PART1_PATH}/ARC-VERSION"
+          mv -f "${TMP_PATH}/ARC-BRANCH" "${PART1_PATH}/ARC-BRANCH"
           mv -f "${TMP_PATH}/bzImage-arc" "${ARC_BZIMAGE_FILE}"
           mv -f "${TMP_PATH}/initrd-arc" "${ARC_RAMDISK_FILE}"
           rm -f "${TMP_PATH}/update.zip"