feat(build): Add software installation step (v5.7)

Author: Hiburger

build.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 
-echo "===== LUMINOS MASTER BUILD SCRIPT (v5.6 - Full AI Integration) ====="
+echo "===== LUMINOS MASTER BUILD SCRIPT (v5.7 - With Software Pack) ====="
 if [ "$(id -u)" -ne 0 ]; then echo "ERROR: This script must be run as root."; exit 1; fi
 
 # --- 1. Define Directories & Vars ---
@@ -10,7 +10,7 @@ WORK_DIR="${BASE_DIR}/work"
 CHROOT_DIR="${WORK_DIR}/chroot"
 ISO_DIR="${WORK_DIR}/iso"
 AI_BUILD_DIR="${WORK_DIR}/ai_build"
-ISO_NAME="LuminOS-0.2-amd64.iso"
+ISO_NAME="LuminOS-0.2.1-amd64.iso" # Updated version number
 
 # --- 2. Clean Up ---
 echo "--> Cleaning up previous build artifacts..."
@@ -36,7 +36,6 @@ apt-get install -y debootstrap squashfs-tools xorriso grub-pc-bin grub-efi-amd64
 echo "====================================================="
 echo "PHASE 0: Pre-downloading AI Models"
 echo "====================================================="
-# Force Ollama to use our specific directory
 export OLLAMA_MODELS="${AI_BUILD_DIR}/models"
 mkdir -p "${OLLAMA_MODELS}"
 
@@ -45,26 +44,21 @@ curl -fL "https://github.com/ollama/ollama/releases/download/v0.1.32/ollama-linu
 chmod +x "${AI_BUILD_DIR}/ollama"
 
 echo "--> Starting temporary Ollama server..."
-# Start server in background using our custom models dir
 OLLAMA_MODELS="${OLLAMA_MODELS}" "${AI_BUILD_DIR}/ollama" serve > "${AI_BUILD_DIR}/server.log" 2>&1 &
 OLLAMA_PID=$!
 echo "Waiting for Ollama server (PID ${OLLAMA_PID})..."
 sleep 10
 
 echo "--> Pulling base model (llama3)..."
-# We use the binary we just downloaded
 OLLAMA_MODELS="${OLLAMA_MODELS}" "${AI_BUILD_DIR}/ollama" pull llama3
 
 echo "--> Stopping temporary Ollama server..."
 kill ${OLLAMA_PID} || true
 wait ${OLLAMA_PID} || true
 
-# VERIFICATION STEP
 SIZE_CHECK=$(du -s "${OLLAMA_MODELS}" | cut -f1)
-# 4000000 KB is roughly 4GB. If it's smaller, something failed.
 if [ "$SIZE_CHECK" -lt 4000000 ]; then
     echo "ERROR: Model download failed or is too small ($SIZE_CHECK KB)."
-    echo "Check ${AI_BUILD_DIR}/server.log for details."
     exit 1
 else
     echo "SUCCESS: AI Models downloaded (${SIZE_CHECK} KB)."
@@ -101,78 +95,9 @@ cp "${BASE_DIR}/assets/"* "${CHROOT_DIR}/usr/share/wallpapers/luminos/"
 
 echo "--> Injecting AI files into system..."
 cp "${AI_BUILD_DIR}/ollama" "${CHROOT_DIR}/usr/local/bin/"
-# Create the directory structure exactly as Ollama expects
 mkdir -p "${CHROOT_DIR}/usr/share/ollama/.ollama"
-# Copy the models we just verified
 cp -r "${AI_BUILD_DIR}/models" "${CHROOT_DIR}/usr/share/ollama/.ollama/"
-echo "--> AI Injection Complete."
 
 
 # --- 7. Run Customization Scripts ---
-echo "--> Running customization scripts..."
-cp "${BASE_DIR}/02-configure-system.sh" "${CHROOT_DIR}/tmp/"
-cp "${BASE_DIR}/03-install-desktop.sh" "${CHROOT_DIR}/tmp/"
-cp "${BASE_DIR}/04-customize-desktop.sh" "${CHROOT_DIR}/tmp/"
-cp "${BASE_DIR}/05-install-ai.sh" "${CHROOT_DIR}/tmp/"
-cp "${BASE_DIR}/07-install-plymouth-theme.sh" "${CHROOT_DIR}/tmp/"
-cp "${BASE_DIR}/06-final-cleanup.sh" "${CHROOT_DIR}/tmp/"
-
-chmod +x "${CHROOT_DIR}/tmp/"*.sh
-
-echo ":: Running 02-configure-system.sh"
-chroot "${CHROOT_DIR}" /tmp/02-configure-system.sh
-echo ":: Running 03-install-desktop.sh"
-chroot "${CHROOT_DIR}" /tmp/03-install-desktop.sh
-echo ":: Running 04-customize-desktop.sh"
-chroot "${CHROOT_DIR}" /tmp/04-customize-desktop.sh
-echo ":: Running 05-install-ai.sh"
-chroot "${CHROOT_DIR}" /tmp/05-install-ai.sh
-echo ":: Running 07-install-plymouth-theme.sh"
-chroot "${CHROOT_DIR}" /tmp/07-install-plymouth-theme.sh
-echo ":: Running 06-final-cleanup.sh"
-chroot "${CHROOT_DIR}" /tmp/06-final-cleanup.sh
-
-echo "--> Unmounting..."
-umount "${CHROOT_DIR}/sys"
-umount "${CHROOT_DIR}/proc"
-umount "${CHROOT_DIR}/dev/pts"
-umount "${CHROOT_DIR}/dev"
-
-# --- 8. Build the ISO ---
-echo "--> Compressing filesystem (SquashFS)..."
-# Added -comp zstd for faster decompression and boot
-mksquashfs "${CHROOT_DIR}" "${ISO_DIR}/live/filesystem.squashfs" -e boot -comp zstd
-
-echo "--> Preparing Bootloader (GRUB)..."
-cp "${CHROOT_DIR}/boot"/vmlinuz* "${ISO_DIR}/live/vmlinuz"
-cp "${CHROOT_DIR}/boot"/initrd.img* "${ISO_DIR}/live/initrd.img"
-
-cat > "${ISO_DIR}/boot/grub/grub.cfg" << EOF
-set default="0"
-set timeout=5
-menuentry "LuminOS v0.2 Live" {
-    linux /live/vmlinuz boot=live quiet splash
-    initrd /live/initrd.img
-}
-EOF
-
-echo "--> Generating ISO image..."
-grub-mkrescue -o "${BASE_DIR}/${ISO_NAME}" "${ISO_DIR}"
-
-echo "--> Cleaning up work directory..."
-sudo rm -rf "${WORK_DIR}"
-
-echo ""
-echo "========================================="
-if [ -f "${BASE_DIR}/${ISO_NAME}" ]; then
-    echo "SUCCESS: LuminOS ISO build is complete!"
-    echo "Find your image at: ${BASE_DIR}/${ISO_NAME}"
-    # Basic size check just to make sure...
-    ISO_SIZE=$(du -h "${BASE_DIR}/${ISO_NAME}" | cut -f1)
-    echo "ISO Size: $ISO_SIZE (Should be > 5G)"
-else
-    echo "ERROR: Build finished but ISO file not found. Sorry."
-    exit 1
-fi
-echo "========================================="
-exit 0
+echo "--> Running customization