3 changed files with 108 additions and 146 deletions
--- a/README.md
+++ b/README.md
@ -2,12 +2,21 @@
 ### Ubuntu 22.04 Quick Install
 - Full install and activation uses wget and curl commands to run the full sequence so you don’t have to manually configure everything.

-**Automatic Installation (one-liner) `wget` install**:
+**Automatic Installation (one-liner)**:
 ```
-sudo wget https://raw.githubusercontent.com/kholia/OSX-KVM/master/wget.ubuntu.install.script -O wget.ubuntu.install.script && ./wget.ubuntu.install.script
+sudo curl -fsSL https://raw.githubusercontent.com/kholia/OSX-KVM/master/wget.install.script | bash
+```
+**Or `wget` install**:
+```
+sudo wget https://raw.githubusercontent.com/kholia/OSX-KVM/master/wget.install.script -O wget.install.script
 ```

-Chooses 7 from:
+#### macOS Recovery and Installation
+- Once OpenCore boots, you can download the macOS installer:
+```
+$ ./fetch-macOS-v2.py
+```
+Choose from:
 ```shell
 1. High Sierra (10.13)  
 2. Mojave (10.14)  
@ -18,7 +27,7 @@ Chooses 7 from:
 7. Sonoma (14)  
 8. Sequoia (15)  

-Select a product to download (1-8): Auto-Chooses 7
+Select a product to download (1-8): 6
 ```
 #### Disk Setup
 1. Select **Disk Utility** from the OpenCore menu.  
@ -39,23 +48,28 @@ Select a product to download (1-8): Auto-Chooses 7
 - Boot the VM and macOS should start with OpenCore managing the EFI environment.  
 - Optionally, you can keep `fetch-macOS-v2.py` handy to upgrade or reinstall newer macOS versions.

-#### macOS Recovery and Installation
- Once OpenCore boots, you can download the macOS installer:
-```
-$ ./fetch-macOS-v2.py
-```
-
 ---

 ### Fedora 38+ Quick Install
 - Full install and activation uses wget and curl commands to run the full sequence so you don’t have to manually configure packages or dependencies.

-**Automatic Installation with `wget` install**:
+**Automatic Installation**:
+
 ```
-sudo wget https://raw.githubusercontent.com/kholia/OSX-KVM/master/wget.fedora.install.script -O wget.fedora.install.script && wget.fedora.install.script
+sudo curl -fsSL https://raw.githubusercontent.com/kholia/OSX-KVM/master/wget.fedora.install.script | bash
+```
+**Or `wget` install**:
+```
+sudo wget https://raw.githubusercontent.com/kholi
+a/OSX-KVM/master/wget.fedora.install.script -O wget.fedora.install.script
 ```

-Chooses 7 from:
+#### macOS Recovery and Installation
+- Once OpenCore boots, you can download the macOS installer using:
+```
+$ ./fetch-macOS-v2.py
+```
+Choose from:
 ```
 1. High Sierra (10.13)  
 2. Mojave (10.14)  
@ -66,7 +80,7 @@ Chooses 7 from:
 7. Sonoma (14)  
 8. Sequoia (15)  

-Select a product to download (1-8): Auto-Chooses 7
+Select a product to download (1-8): 6
 ```
 #### Disk Setup
 1. Open **Disk Utility** in the OpenCore menu.  
@ -87,12 +101,6 @@ Select a product to download (1-8): Auto-Chooses 7
 - Boot the VM; OpenCore handles the EFI environment and macOS should load.  
 - Keep `fetch-macOS-v2.py` available for future upgrades or reinstallations.  

-#### macOS Recovery and Installation
- Once OpenCore boots, you can download the macOS installer using:
-```
-$ ./fetch-macOS-v2.py
-```
-
 ---

 #### Notes
--- a/macOS.qcow2
+++ b/macOS.qcow2
--- a/wget.ubuntu.install.script
+++ b/wget.ubuntu.install.script
@ -1,38 +1,33 @@
 #!/usr/bin/bash
-
-# macOS KVM Installation Script with wget/curl support
-# 
-# Quick Install (one-liner):
-#   curl -fsSL https://raw.githubusercontent.com/yourusername/OSX-KVM/master/install-macos-kvm.sh | bash
-#
-# Usage: ./install-macos-kvm.sh [OPTIONS]
-# Options:
-#   --use-curl    Use curl instead of wget for downloads
-#   --help        Show this help message
+# macOS KVM Installation Script for a brand-new Linux system
+# Quick Install: curl -fsSL <URL> | bash

 set -e  # Exit on any error

 # Default settings
-USE_CURL=true
+USE_CURL=false
 INSTALL_DIR="$HOME/OSX-KVM"

 # Function to display help
 show_help() {
-    echo "macOS KVM Installation Script"
-    echo ""
-    echo "Usage: $0 [OPTIONS]"
-    echo ""
-    echo "Options:"
-    echo "  --use-curl    Use curl instead of wget for downloads"
-    echo "  --help        Show this help message"
-    echo ""
-    echo "This script will:"
-    echo "  1. Clone the OSX-KVM repository"
-    echo "  2. Download macOS recovery image"
-    echo "  3. Convert BaseSystem.dmg to raw format"
-    echo "  4. Create macOS disk image (100GB)"
-    echo "  5. Set proper permissions for libvirt"
-    echo "  6. Launch macOS VM"
+    cat <<EOF
+macOS KVM Installation Script
+
+Usage: $0 [OPTIONS]
+
+Options:
+  --use-curl    Use curl instead of wget for downloads
+  --help        Show this help message
+
+This script will:
+  1. Install all required packages
+  2. Clone the OSX-KVM repository
+  3. Download macOS recovery image
+  4. Convert BaseSystem.dmg to raw format
+  5. Create macOS disk image (100GB)
+  6. Set proper permissions for libvirt
+  7. Launch macOS VM
+EOF
 }

 # Function to check if command exists
@ -40,21 +35,25 @@ command_exists() {
    command -v "$1" >/dev/null 2>&1
 }

-# Function to download with fallback
+# Function to install packages via apt
+install_package() {
+    local pkg="$1"
+    if ! dpkg -s "$pkg" >/dev/null 2>&1; then
+        echo "Installing missing package: $pkg"
+        sudo apt-get install -y "$pkg"
+    fi
+}
+
+# Function to download files
 download_file() {
    local url="$1"
    local output="$2"
-    
    echo "Downloading: $url"
-    
    if [ "$USE_CURL" = true ] && command_exists curl; then
-        echo "Using curl for download..."
        curl -L -o "$output" "$url"
    elif command_exists wget; then
-        echo "Using wget for download..."
        wget -O "$output" "$url"
    elif command_exists curl; then
-        echo "wget not found, falling back to curl..."
        curl -L -o "$output" "$url"
    else
        echo "Error: Neither wget nor curl found. Please install one of them."
@ -75,68 +74,65 @@ while [[ $# -gt 0 ]]; do
            ;;
        *)
            echo "Unknown option: $1"
-            echo "Use --help for usage information"
+            show_help
            exit 1
            ;;
    esac
 done

-# Check for required commands
-echo "Checking system requirements..."
+echo "Updating package list..."
+sudo apt-get update -y

-if ! command_exists git; then
-    echo "Error: git is required but not installed."
-    exit 1
-fi
+# Install required packages
+REQUIRED_PKGS=(git wget curl python3 python3-pip qemu-system qemu-utils \
+uml-utilities virt-manager libguestfs-tools p7zip-full make dmg2img \
+tesseract-ocr tesseract-ocr-eng genisoimage vim net-tools screen)

-if ! command_exists qemu-img; then
-    echo "Error: qemu-img is required but not installed."
-    echo "Please install qemu-utils or qemu-system package"
-    exit 1
-fi
+for pkg in "${REQUIRED_PKGS[@]}"; do
+    install_package "$pkg"
+done

-# Check for download capability
-if ! command_exists wget && ! command_exists curl; then
-    echo "Error: Neither wget nor curl found."
-    echo "Please install wget or curl to continue."
-    exit 1
-fi
+echo "✓ All required packages installed"

-echo "✓ System requirements check passed"
+# Check system commands
+for cmd in git qemu-img wget curl python3 make dmg2img; do
+    if ! command_exists "$cmd"; then
+        echo "Error: $cmd is required but not installed."
+        exit 1
+    fi
+done

-# Create installation directory if it doesn't exist
+echo "✓ System commands verified"
+
+# Create installation directory
 if [ -d "$INSTALL_DIR" ]; then
-    echo "Warning: $INSTALL_DIR already exists. Backing up to ${INSTALL_DIR}.backup"
+    echo "Warning: $INSTALL_DIR exists. Backing up to ${INSTALL_DIR}.backup"
    mv "$INSTALL_DIR" "${INSTALL_DIR}.backup.$(date +%Y%m%d_%H%M%S)"
 fi

-# Clone the repository
+# Clone repository
 echo "Cloning OSX-KVM repository..."
 git clone https://github.com/kholia/OSX-KVM.git "$INSTALL_DIR"
 cd "$INSTALL_DIR"

-# Download macOS recovery image (automatically choose Sonoma - option 7)
-echo "Downloading macOS recovery image (Sonoma - Recommended)..."
+# Setup KVM
+sudo modprobe kvm
+echo 1 | sudo tee /sys/module/kvm/parameters/ignore_msrs >/dev/null || true
+[ -f kvm_amd.conf ] && sudo cp kvm_amd.conf /etc/modprobe.d/kvm.conf
+
+sudo usermod -aG kvm "$(whoami)"
+sudo usermod -aG libvirt "$(whoami)"
+sudo usermod -aG input "$(whoami)"
+
+# Download macOS recovery image
+echo "Downloading macOS recovery image..."
 if [ -f "fetch-macOS-v2.py" ]; then
-    echo "7" | python3 fetch-macOS-v2.py
+    python3 fetch-macOS-v2.py
 else
-    echo "Warning: fetch-macOS-v2.py not found, attempting manual download..."
-    # Fallback download URLs for macOS recovery images
    RECOVERY_URL="https://updates.cdn-apple.com/2019FallFCS/fullrestores/061-44998/B5A3E286-1C4A-11EA-99D4-864D6786AB92/BaseSystem.dmg"
    download_file "$RECOVERY_URL" "BaseSystem.dmg"
 fi

-sudo apt-get install qemu-system uml-utilities virt-manager git \
-    wget libguestfs-tools p7zip-full make dmg2img tesseract-ocr \
-    tesseract-ocr-eng genisoimage vim net-tools screen -y
-
-sudo modprobe kvm; echo 1 | sudo tee /sys/module/kvm/parameters/ignore_msrs
-sudo cp kvm_amd.conf /etc/modprobe.d/kvm.conf  # for amd boxes only
-
-sudo usermod -aG kvm $(whoami)
-sudo usermod -aG libvirt $(whoami)
-sudo usermod -aG input $(whoami)
-
 # Convert BaseSystem.dmg to raw format
 echo "Converting BaseSystem.dmg to raw format..."
 if [ -f "BaseSystem.dmg" ]; then
@ -147,78 +143,36 @@ else
    exit 1
 fi

-# Create macOS disk image (256GB)
+# Create macOS disk image
 echo "Creating macOS disk image (256GB)..."
 qemu-img create -f qcow2 macOS.qcow2 256G
-echo "✓ macOS.qcow2 created successfully"
-
-# Create symlink for script compatibility
-echo "Creating compatibility symlink..."
 ln -sf macOS.qcow2 mac_hdd_ng.img
+echo "✓ Disk image created"

-# Fix permissions for libvirt
-echo "Setting up permissions for libvirt..."
-sudo chown libvirt-qemu:libvirt-qemu macOS.qcow2 2>/dev/null || {
-    echo "Warning: Could not change ownership to libvirt-qemu. You may need to run this manually:"
-    echo "  sudo chown libvirt-qemu:libvirt-qemu $INSTALL_DIR/macOS.qcow2"
-}
-
-sudo chmod 664 macOS.qcow2 2>/dev/null || {
-    echo "Warning: Could not change permissions. You may need to run this manually:"
-    echo "  sudo chmod 664 $INSTALL_DIR/macOS.qcow2"
-}
-
-# Fix directory permissions
-sudo chmod 755 "$INSTALL_DIR" 2>/dev/null || {
-    echo "Warning: Could not change directory permissions. You may need to run this manually:"
-    echo "  sudo chmod 755 $INSTALL_DIR"
-}
+# Set permissions for libvirt
+sudo chown libvirt-qemu:libvirt-qemu macOS.qcow2 2>/dev/null || true
+sudo chmod 664 macOS.qcow2 2>/dev/null || true
+sudo chmod 755 "$INSTALL_DIR" 2>/dev/null || true

 # Make scripts executable
-echo "Making scripts executable..."
 chmod +x *.sh

-# Check if OpenCore exists and build if necessary
+# Build OpenCore if missing
 if [ ! -f "OpenCore/OpenCore.qcow2" ]; then
    echo "OpenCore not found, attempting to build..."
-    cd OpenCore
-    if [ -f "Makefile" ]; then
-        make
-    else
-        echo "Warning: Could not build OpenCore. You may need to build it manually."
-    fi
+    cd OpenCore || exit
+    [ -f "Makefile" ] && make || echo "Warning: Could not build OpenCore"
    cd ..
 fi

 echo ""
 echo "🎉 Installation completed successfully!"
-echo ""
 echo "Next steps:"
-echo "1. To start the macOS VM using the script:"
-echo "   cd $INSTALL_DIR && sudo ./OpenCore-Boot.sh"
-echo ""
-echo "2. To use with virt-manager:"
-echo "   - Import the provided libvirt XML configuration"
-echo "   - Start the VM through virt-manager interface"
-echo ""
-echo "3. During installation:"
-echo "   - Select 'macOS Base System' from OpenCore"
-echo "   - Use Disk Utility to format the 256GB drive"
-echo "   - Install macOS to the formatted drive"
-echo ""
-echo "Files created:"
-echo "  - BaseSystem.img (macOS installer)"
-echo "  - macOS.qcow2 (256GB virtual disk)"
-echo "  - mac_hdd_ng.img -> macOS.qcow2 (compatibility symlink)"
+echo "1. Start macOS VM: cd $INSTALL_DIR && sudo ./OpenCore-Boot.sh"
+echo "2. Use virt-manager: import XML, start VM"
 echo ""

-# Ask if user wants to start the VM now
-read -p "Would you like to start the macOS VM now? (y/n): " -n 1 -r
+# Prompt to start VM
+read -p "Start macOS VM now? (y/n): " -n 1 -r
 echo
-if [[ $REPLY =~ ^[Yy]$ ]]; then
-    echo "Starting macOS VM..."
-    sudo ./OpenCore-Boot.sh
-else
-    echo "You can start the VM later by running:"
-    echo "  cd $INSTALL_DIR && sudo ./OpenCore-Boot.sh"
-fi
+[[ $REPLY =~ ^[Yy]$ ]] && sudo ./OpenCore-Boot.sh || echo "VM can be started later"