Update scripts to include logging, remove python requirement

Uses OCE-Build to bootstrap python environment

Author: Qonfused

docs/README.md

@@ -350,14 +350,6 @@ Refer to [HyperV-versions.md](https://github.com/acidanthera/MacHyperVSupport/bl
 
 ## ✨ Getting Started
 
-> [!IMPORTANT]
-> This project requires Python 3 to be installed. You can download the latest version of Python from the [official website](https://www.python.org/downloads/) or from the [Microsoft Store](https://apps.microsoft.com/search/publisher?name=Python+Software+Foundation&hl=en-us&gl=US).
->
-> After installing Python, you can check if it's installed correctly by running the below command in PowerShell:
-> ```ps
-> python --version
-> ```
-
 If you opt to use one of the pre-built releases from this repository, you can skip to [2. Configure OpenCore for your hardware](#2-configure-opencore-for-your-hardware) to setup OpenCore for your specific CPU, and then proceed to [4. Setting up Hyper-V](#4-setting-up-hyper-v) to create a new virtual machine.
 
 Those who wish to build this project from source can follow the below steps to clone this repository, build the EFI, and setup Hyper-V.

scripts/lib/convert-efi-disk.ps1

@@ -11,15 +11,23 @@ param (
   [string]$path = "$($pwd)\EFI",
   [string]$dest = "$($pwd)\EFI.vhdx"
 )
+$ErrorActionPreference = 'Stop'
 
 # Prompt for Administrator priviledges
 if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-  Start-Process powershell.exe -Verb RunAs -ArgumentList ("-noprofile -file `"{0}`" -elevated -pwd $pwd -path $path -dest $dest" -f ($myinvocation.MyCommand.Definition));
+  Start-Process powershell.exe -Verb RunAs -ArgumentList ("-NoExit -noprofile -file `"{0}`" -elevated -pwd $pwd -name $name -version $version -cpu $cpu -ram $ram -size $size -outdir $outdir" -f ($myinvocation.MyCommand.Definition));
   exit;
 }
 
+# Log a warning if the Microsoft-Hyper-V feature is not enabled
+if (-not (Get-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -ErrorAction SilentlyContinue).State -eq 'Enabled') {
+  Write-Warning "Microsoft-Hyper-V feature is not enabled. " +
+    "Please enable it in Windows Features before creating a new VM."
+}
+
 
 # Create and mount a new EFI.vhdx disk
+Write-Host "Creating and mounting EFI VHDX disk at $dest..."
 $efiDisk = New-VHD -Path "$dest" -Dynamic -SizeBytes 5GB |
   Mount-VHD -Passthru |
   Initialize-Disk -PartitionStyle "GPT" -Confirm:$false -Passthru |
@@ -35,6 +43,11 @@ if (Test-Path -Path $scriptsDir) {
   # Only copy shell scripts (.sh) intended for post-install
   $postInstallScripts = Get-ChildItem -Path $scriptsDir -Filter "*.sh" -Recurse
   if ($postInstallScripts) {
+    # Create Scripts directory on the VHDX disk
+    New-Item -Path "$($efiDisk.DriveLetter):\Scripts" -ItemType Directory -Force | Out-Null
+
+    # Copy each script to the Scripts directory on the VHDX disk
+    Write-Host "Copying post-install scripts to $($efiDisk.DriveLetter):\Scripts"
     foreach ($script in $postInstallScripts) {
       $destinationPath = "$($efiDisk.DriveLetter):\Scripts\$($script.Name)"
       Copy-Item -Path $script.FullName -Destination $destinationPath -Force
@@ -57,12 +70,16 @@ if (Test-Path -Path $toolsDir) {
 # Copy macOS recovery image if present
 $recoveryImage = "com.apple.recovery.boot"
 if (Test-Path -Path "$($pwd)\$recoveryImage") {
+  Write-Host "Copying macOS recovery image to EFI disk..."
   Copy-Item -Path "$($pwd)\$recoveryImage" -Recurse -Destination "$($efiDisk.DriveLetter):\$recoveryImage"
 }
 
 # Unmount VHDX disk
+Write-Host "Unmounting EFI VHDX disk..."
 Dismount-VHD -Path "$dest" | Out-Null
 
+Write-Host "Optimizing EFI VHDX disk..."
+
 # Optimize the VHDX disk to compress the image
 Mount-VHD -Path "$dest" -ReadOnly | Out-Null
 Optimize-VHD -Path "$dest" -Mode Full

scripts/lib/create-macos-recovery.ps1

@@ -12,12 +12,7 @@ param (
   [string]$version = "latest",
   [string]$outdir = "$($pwd)\com.apple.recovery.boot"
 )
-
-# Check if python is installed, otherwise fail the script immediately.
-if (-not (Get-Command python.exe -ErrorAction SilentlyContinue)) {
-  Write-Error "Python is not installed. Please install Python 3.8 or later."
-  exit 1
-}
+$ErrorActionPreference = 'Stop'
 
 # Create `outdir` if it doesn't exist
 New-Item -ItemType Directory "$outdir" -Force | Out-Null
@@ -42,4 +37,13 @@ switch ($version)
 }
 
 # Run macrecovery.py script
-& python.exe "$macrecovery" -b "$b" -m "$m" -o "$outdir" download
+# & python.exe "$macrecovery" -b "$b" -m "$m" -o "$outdir" download
+icm `
+  -ScriptBlock $([Scriptblock]::Create($(iwr 'https://raw.githubusercontent.com/Qonfused/OCE-Build/main/ci/bootstrap.ps1'))) `
+  -ArgumentList (@("-e $macrecovery -b $b -m $m -o $outdir download"))
+
+# Check if the outdir was created
+if (-not (Test-Path -Path $outdir)) {
+  Write-Error "Failed to create recovery directory at $outdir. Please check the script and try again."
+  exit 1
+}

scripts/lib/create-virtual-machine.ps1

@@ -15,22 +15,38 @@ param (
   [int]$size = 50,  #
   [string]$outdir = "$env:USERPROFILE\Documents\Hyper-V"
 )
+$ErrorActionPreference = 'Stop'
 
 # Prompt for Administrator priviledges
 if (!([Security.Principal.WindowsPrincipal][Security.Principal.WindowsIdentity]::GetCurrent()).IsInRole([Security.Principal.WindowsBuiltInRole]::Administrator)) {
-  Start-Process powershell.exe -Verb RunAs -ArgumentList ("-noprofile -file `"{0}`" -elevated -pwd $pwd -name $name -version $version -cpu $cpu -ram $ram -size $size -outdir $outdir" -f ($myinvocation.MyCommand.Definition));
+  Start-Process powershell.exe -Verb RunAs -ArgumentList ("-NoExit -noprofile -file `"{0}`" -elevated -pwd $pwd -name $name -version $version -cpu $cpu -ram $ram -size $size -outdir $outdir" -f ($myinvocation.MyCommand.Definition));
   exit;
 }
 
+# Log a warning if the Microsoft-Hyper-V feature is not enabled
+if (-not (Get-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -ErrorAction SilentlyContinue).State -eq 'Enabled') {
+  Write-Warning "Microsoft-Hyper-V feature is not enabled. " +
+    "Please enable it in Windows Features before creating a new VM."
+}
+
+# Check if $outdir/$name already exists (and is non-empty)
+if ((Test-Path -Path "$outdir\$name") -and (Get-ChildItem -Path "$outdir\$name").Count -gt 0) {
+  Write-Host "Virtual machine '$name' already exists in '$outdir'. Please choose a different name or delete the existing one."
+  exit 1
+}
+
 
 # Create new virtual machine
+Write-Host "Creating new virtual machine '$name'..."
 New-VM -Generation 2 -Name "$name" -path "$outdir" -NoVHD | Out-Null
 
 # Configure network adapter to use the default vswitch
+Write-Host "Configuring network adapter for virtual machine '$name'..."
 $networkAdapter = Get-VMNetworkAdapter -VMName "$name"
 Connect-VMNetworkAdapter -VMName "$name" -Name "$($networkAdapter.name)" -SwitchName "Default Switch"
 
 # Create EFI disk
+Write-Host "Creating EFI disk for virtual machine '$name'..."
 $efiVHD = "$outdir\$name\EFI.vhdx"
 & powershell.exe "$PSScriptRoot\create-macos-recovery.ps1" -version "$version"
 & powershell.exe "$PSScriptRoot\convert-efi-disk.ps1" -dest "$efiVHD"
@@ -40,7 +56,8 @@ $efiDisk = Get-VMHardDiskDrive -VMName "$name"
 # Create post-install VHDX if tools folder is present
 $toolsDir = "$($pwd)\Tools"
 if (Test-Path -Path "$toolsDir") {
-  $toolsVHD = "$outdir\$name\Tools.vhdx" 
+  $toolsVHD = "$outdir\$name\Tools.vhdx"
+  Write-Host "Creating Tools VHDX disk for virtual machine '$name'..."
   # Create and mount a new tools.vhdx disk
   $toolsDisk = New-VHD -Path "$toolsVHD" -Dynamic -SizeBytes 512MB |
     Mount-VHD -Passthru |
@@ -57,6 +74,7 @@ if (Test-Path -Path "$toolsDir") {
 
 # Create macOS disk
 $macOSVHD = "$outdir\$name\$name.vhdx" 
+Write-Host "Creating macOS disk for virtual machine '$name'..."
 New-VHD -Path "$macOSVHD" -SizeBytes $($size * 1GB) |
   Mount-VHD -Passthru |
   Initialize-Disk -PartitionStyle "GPT" -Confirm:$false -Passthru |
@@ -65,9 +83,11 @@ New-VHD -Path "$macOSVHD" -SizeBytes $($size * 1GB) |
 Dismount-DiskImage -ImagePath "$macOSVHD" | Out-Null
 
 # Add macOS disk to virtual machine
+Write-Host "Adding macOS disk to virtual machine '$name'..."
 Add-VMHardDiskDrive -VMName "$name" -Path "$macOSVHD" -ControllerType SCSI
 
 # Configure virtual machine
+Write-Host "Configuring virtual machine '$name'..."
 Set-VM `
   -Name "$name" `
   -ProcessorCount $cpu `
@@ -76,3 +96,6 @@ Set-VM `
 Set-VMFirmware -VMName "$name" `
   -EnableSecureBoot Off `
   -FirstBootDevice $efiDisk
+
+# Wait for user input before closing (to show any errors)
+Write-Host "`nVirtual machine '$name' created successfully at $outdir\$name.`n"