progress snapshot

scripts/build-iso.sh

@@ -3,7 +3,7 @@
 # Creates Debian 13 ISO with embedded preseed configuration
 # ALL work done in Docker container - no host operations
 
-set -e
+set -euo pipefail
 
 BUILD_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 OUTPUT_DIR="$BUILD_DIR/output"

scripts/qvm.sh

@@ -2,7 +2,7 @@
 # Football VM Control Script (libvirt/virsh)
 # Manages QEMU VM for testing Football ISO
 
-set -e
+set -euo pipefail
 
 BUILD_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
 ISO_FILE="$BUILD_DIR/output/football-installer.iso"
@@ -115,7 +115,19 @@ EOF
     
     stop)
         echo "Stopping VM..."
-        virsh shutdown "$VM_NAME" && echo "VM stopped" || virsh destroy "$VM_NAME" && echo "VM destroyed"
+        virsh shutdown "$VM_NAME" 2>/dev/null || true
+        # Wait for VM to actually stop (up to 30 seconds)
+        for _ in {1..30}; do
+            if ! virsh list --name | grep -q "^${VM_NAME}$"; then
+                echo "VM stopped"
+                break
+            fi
+            sleep 1
+        done
+        # If still running, force destroy
+        if virsh list --name | grep -q "^${VM_NAME}$"; then
+            virsh destroy "$VM_NAME" && echo "VM destroyed"
+        fi
         ;;
     
     reboot)
@@ -141,10 +153,8 @@ EOF
         ;;
     
     delete)
-        echo "WARNING: This will delete VM, disk, and ISO!"
-        echo "Press Ctrl+C to cancel, or Enter to continue..."
-        read
-        
+        echo "Deleting VM, disk, and ISO..."
+
         # Stop VM
         virsh destroy "$VM_NAME" 2>/dev/null || true
         virsh undefine "$VM_NAME" 2>/dev/null || true

scripts/test-iso.sh

@@ -3,7 +3,7 @@
 # Boots QEMU VM from ISO to test installation
 # All work done in Docker container
 
-set -e
+set -euo pipefail
 
 BUILD_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 ISO_PATH="$BUILD_DIR/output/football-installer.iso"
@@ -107,7 +107,7 @@ screen -dmS football-iso-test \
 # Save QEMU PID for later use
 pgrep -f "qemu-system-x86_64.*$DISK_PATH" | head -1 > "$VM_PID_FILE"
 
-echo "✅ VM started (PID: $(cat $VM_PID_FILE 2>/dev/null || echo 'unknown'))"
+echo "✅ VM started (PID: $(cat "$VM_PID_FILE" 2>/dev/null || echo 'unknown'))"
 echo ""
 
 # ============================================================================
@@ -117,7 +117,7 @@ echo ""
 echo "[4/4] Monitoring boot (waiting 120 seconds)..."
 echo ""
 
-for i in {1..120}; do
+for _ in {1..120}; do
     if [ -f "$CONSOLE_LOG" ]; then
         # Check for installation prompts
         if grep -q "Choose the country" "$CONSOLE_LOG" 2>/dev/null; then

scripts/verify-system.sh

@@ -3,7 +3,7 @@
 # Verifies all functional requirements are met after installation
 # Runs automatically on first boot
 
-set -e
+set -euo pipefail
 
 LOG_FILE="/var/log/football-first-boot-verification.log"
 STATUS_FILE="/var/lib/football/verification-status"
@@ -12,7 +12,6 @@ STATUS_FILE="/var/lib/football/verification-status"
 RED='\033[0;31m'
 GREEN='\033[0;32m'
 YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
 NC='\033[0m'
 
 # Logging function