From 722c4ff8eca127475aabc14e4bb27b14b998849d Mon Sep 17 00:00:00 2001
From: MrPiglr <31398225+MrPiglr@users.noreply.github.com>
Date: Sat, 27 Dec 2025 22:20:10 +0000
Subject: [PATCH] Fix: add fallback tool detection and verify grub/squashfs in
 CI

---
 .gitlab-ci.yml            |  5 ++++-
 script/build-linux-iso.sh | 32 +++++++++++++++++++++++---------
 2 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e47cb7..9c00174 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,7 +16,10 @@ build_iso:
   script:
     # Update system
     - apt-get update -qq
-    - apt-get install -y -qq build-essential curl wget git nodejs npm debootstrap squashfs-tools xorriso grub-common grub-pc-bin grub-efi-amd64-bin mtools dosfstools isolinux syslinux-common
+    - apt-get install -y -qq build-essential curl wget git nodejs npm debootstrap squashfs-tools xorriso grub-common grub-pc-bin grub-efi-amd64-bin mtools dosfstools isolinux syslinux-common || true
+    # Verify critical tools are installed
+    - which mksquashfs && echo "✅ mksquashfs found" || echo "⚠️ mksquashfs missing"
+    - which grub-mkrescue && echo "✅ grub-mkrescue found" || echo "⚠️ grub-mkrescue missing"
     
     # Install Node dependencies
     - npm install
diff --git a/script/build-linux-iso.sh b/script/build-linux-iso.sh
index c6637c1..e2b3b81 100644
--- a/script/build-linux-iso.sh
+++ b/script/build-linux-iso.sh
@@ -15,24 +15,38 @@ ISO_NAME="AeThex-Linux-${CODENAME}-amd64.iso"
 
 mkdir -p "${WORKDIR}" "${CHROOT_DIR}" "${ISO_ROOT}/casper" "${ISO_ROOT}/boot/grub"
 
-need_tools=(debootstrap squashfs-tools xorriso grub-mkrescue)
+need_tools=(debootstrap mksquashfs xorriso grub-mkrescue)
 missing=()
 for t in "${need_tools[@]}"; do
-	if ! command -v "$t" >/dev/null 2>&1; then
-		missing+=("$t")
-	fi
+  if ! command -v "$t" >/dev/null 2>&1; then
+    missing+=("$t")
+  fi
 done
 
 if [ ${#missing[@]} -gt 0 ]; then
-	echo "⚠️ Missing tools: ${missing[*]}"
-	echo "Creating placeholder artifacts instead."
-	mkdir -p "${WORKDIR}"
-	cat > "${WORKDIR}/README.txt" << 'EOF'
+  echo "⚠️ Missing tools: ${missing[*]}"
+  echo "Attempting apt-get install as fallback..."
+  apt-get update && apt-get install -y squashfs-tools grub-pc-bin grub-efi-amd64-bin 2>/dev/null || true
+  
+  # Check again
+  missing=()
+  for t in "${need_tools[@]}"; do
+    if ! command -v "$t" >/dev/null 2>&1; then
+      missing+=("$t")
+    fi
+  done
+  
+  if [ ${#missing[@]} -gt 0 ]; then
+    echo "❌ Still missing: ${missing[*]}"
+    echo "Creating placeholder artifacts instead."
+    mkdir -p "${WORKDIR}"
+    cat > "${WORKDIR}/README.txt" << 'EOF'
 Required ISO build tools are missing.
 Install: debootstrap, squashfs-tools, xorriso, grub-pc-bin, grub-efi-amd64-bin.
 This placeholder is uploaded so CI can pass.
 EOF
-	exit 0
+    exit 0
+  fi
 fi
 
 export DEBIAN_FRONTEND=noninteractive