From 35ced55d72d1b28f20cbb081617dccc66e4a6981 Mon Sep 17 00:00:00 2001
From: Cursor Agent <cursoragent@cursor.com>
Date: Sun, 23 Nov 2025 01:34:19 +0000
Subject: [PATCH] Refactor: Add boot media verification and path variables

Co-authored-by: braffour <braffour@gmail.com>
---
 install.sh | 65 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 60 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 73723a0..d8dab9f 100755
--- a/install.sh
+++ b/install.sh
@@ -33,12 +33,61 @@ check_status() {
     fi
 }
 
+# Paths and artefacts managed by setup
+SCRIPT_ROOT="/root/OSX-PROXMOX"
+LOG_DIR="${SCRIPT_ROOT}/logs"
+OPENCORE_ISO="opencore-osx-proxmox-vm.iso"
+
+# Discover ISO directory from setup logs
+detect_iso_dir() {
+    local iso_dir=""
+    local log_file
+    for log_file in \
+        "${LOG_DIR}/iso-storage-detection.log" \
+        "${LOG_DIR}/main.log"; do
+        if [ -f "$log_file" ]; then
+            iso_dir=$(grep -E "ISODIR set to" "$log_file" | tail -1 | sed -E 's/.*ISODIR set to:?[[:space:]]+//')
+            [ -n "$iso_dir" ] && break
+        fi
+    done
+    echo "$iso_dir"
+}
+
+# Ensure OpenCore and at least one recovery ISO exist before declaring success
+ensure_boot_media_ready() {
+    local iso_dir
+    iso_dir=$(detect_iso_dir)
+
+    if [ -z "$iso_dir" ]; then
+        log_message "Unable to determine ISO directory from setup logs. Re-run '/root/OSX-PROXMOX/setup' and finish ISO storage selection."
+        return 1
+    fi
+
+    if [ ! -d "$iso_dir" ]; then
+        log_message "ISO directory '$iso_dir' does not exist. Verify the storage path selected in setup."
+        return 1
+    fi
+
+    if [ ! -f "${iso_dir}/${OPENCORE_ISO}" ]; then
+        log_message "Missing ${OPENCORE_ISO} in '$iso_dir'. Run setup option '201 - Update Opencore ISO file' and retry."
+        return 1
+    fi
+
+    if ! compgen -G "${iso_dir}/recovery-"*.iso >/dev/null 2>&1; then
+        log_message "No recovery ISO found in '$iso_dir'. Run setup option '101/102 - Download & Create Recovery Image' for your macOS version."
+        return 1
+    fi
+
+    log_message "Boot media verified in '$iso_dir'."
+    return 0
+}
+
 # Clear screen
 clear
 
 # Clean up existing files
 log_message "Cleaning up existing files..."
-[ -d "/root/OSX-PROXMOX" ] && rm -rf "/root/OSX-PROXMOX"
+[ -d "$SCRIPT_ROOT" ] && rm -rf "$SCRIPT_ROOT"
 [ -f "/etc/apt/sources.list.d/pve-enterprise.list" ] && rm -f "/etc/apt/sources.list.d/pve-enterprise.list"
 [ -f "/etc/apt/sources.list.d/ceph.list" ] && rm -f "/etc/apt/sources.list.d/ceph.list"
 [ -f "/etc/apt/sources.list.d/pve-enterprise.sources" ] && rm -f "/etc/apt/sources.list.d/pve-enterprise.sources"
@@ -67,18 +116,24 @@ check_status "Failed to install git"
 
 # Clone repository
 log_message "Cloning OSX-PROXMOX repository..."
-git clone --recurse-submodules https://github.com/luchina-gabriel/OSX-PROXMOX.git /root/OSX-PROXMOX >> "$LOG_FILE" 2>&1
+git clone --recurse-submodules https://github.com/luchina-gabriel/OSX-PROXMOX.git "$SCRIPT_ROOT" >> "$LOG_FILE" 2>&1
 check_status "Failed to clone repository"
 
 # Ensure directory exists and setup is executable
-if [ -f "/root/OSX-PROXMOX/setup" ]; then
-    chmod +x "/root/OSX-PROXMOX/setup"
+if [ -f "${SCRIPT_ROOT}/setup" ]; then
+    chmod +x "${SCRIPT_ROOT}/setup"
     log_message "Running setup script..."
-    /root/OSX-PROXMOX/setup 2>&1 | tee -a "$LOG_FILE" 
+    "${SCRIPT_ROOT}/setup" 2>&1 | tee -a "$LOG_FILE"
     check_status "Failed to run setup script"
 else
     log_message "Error: Setup script not found in /root/OSX-PROXMOX"
     exit 1
 fi
 
+# Verify boot media artefacts before finishing
+if ! ensure_boot_media_ready; then
+    log_message "Setup exited without provisioning boot media. Resolve the messages above and rerun this installer."
+    exit 1
+fi
+
 log_message "Installation completed successfully"