Cloverless

.gitignore

@@ -1,4 +1,4 @@
 clover*
 Clover*
 .DS_Store
-app/RunMojaveVirtualbox.app.zip
+app/RunMacOSVirtualbox.app.zip

Makefile

@@ -1,13 +1,12 @@
-SCRIPT=./runMojaveVirtualbox.sh
+SCRIPT=./runMacOSVirtualbox.sh
 SHELL=bash
 
 help:
 	@echo "Some available commands:"
 	@echo " * all      : run everything needed (check, installer, vm, patch, run, stop, eject)"
 	@echo " * check    : check environment"
 	@echo " * installer: create macOS installer image"
-	@echo " * clover   : create clover boot image"
-	@echo " * patch    : add APFS drivers to VM EFI to boot w/o clover"
+	@echo " * patch    : add APFS drivers to VM EFI to boot"
 	@echo " * vm       : create VM and disk"
 	@echo " * run      : run VM"
 	@echo " * stop     : stop VM"
@@ -32,9 +31,6 @@ check:
 installer:
 	@bash  $(SCRIPT) installer
 
-clover:
-	@bash  $(SCRIPT) clover
-
 patch:
 	@bash  $(SCRIPT) patch
 
@@ -72,10 +68,10 @@ test: dependencies
 	@echo "Running first round of shell checks..."
 	@shellcheck -x *.sh
 	@echo "Running second round of shell checks..."
-	@shellharden --check runMojaveVirtualbox.sh
+	@shellharden --check runMacOSVirtualbox.sh
 
 harden: dependencies
-	@shellharden --replace runMojaveVirtualbox.sh
+	@shellharden --replace runMacOSVirtualbox.sh
 
 style: dependencies
 	@shfmt -i 2 -w -s *.sh
@@ -86,9 +82,9 @@ dependencies:
 	@type shfmt >/dev/null 2>&1 || (echo "Run 'brew install shfmt' first." >&2 ; exit 1)
 
 release:
-	@cp runMojaveVirtualbox.sh app/RunMojaveVirtualbox.app/Contents/Resources/
-	@cd app; rm -f RunMojaveVirtualbox.app.zip || true
-	@cd app; zip -r RunMojaveVirtualbox.app.zip RunMojaveVirtualbox.app/
+	@cp runMacOSVirtualbox.sh app/runMacOSVirtualbox.app/Contents/Resources/
+	@cd app; rm -f runMacOSVirtualbox.app.zip || true
+	@cd app; zip -r runMacOSVirtualbox.app.zip runMacOSVirtualbox.app/
 	@open app
 	@open https://github.com/AlexanderWillner/runMacOSinVirtualBox/releases
 

README.md

@@ -1,8 +1,8 @@
-# Run macOS 10.14 Mojave (and other versions) in VirtualBox on macOS
+# Run macOS 10.15 Catalina (and other versions) in VirtualBox on macOS
 
 ## Overview
 
-Simple script to automatically download, install and run macOS 10.14 Mojave (and other versions) in VirtualBox on macOS. Since VirtualBox does not support booting from APFS volumes, this script is copying the APFS EFI drivers automatically.
+Simple script to automatically download, install and run macOS 10.15 Catalina (and other versions) in VirtualBox on macOS. Since VirtualBox does not support booting from APFS volumes, this script is copying the APFS EFI drivers automatically.
 
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/722e2f9736844387b611945fb430d195)](https://app.codacy.com/app/AlexanderWillner/runMacOSinVirtualBox?utm_source=github.com&utm_medium=referral&utm_content=AlexanderWillner/runMacOSinVirtualBox&utm_campaign=Badge_Grade_Dashboard)
 
@@ -35,16 +35,16 @@ Execute ```make all``` to setup and run everything. After the installer reboots,
 ```
 $ make all
 Running checks (around 1 second)....
-Creating image '/Users/awi/VirtualBox VMs/macOS-Mojave.dmg' (around 20 seconds, version 14.2.2, will need sudo)....
-Creating iso '/Users/awi/VirtualBox VMs/macOS-Mojave.iso.cdr' (around 25 seconds)....
-Creating VM HDD '/Users/awi/VirtualBox VMs/macOS-Mojave/macOS-Mojave.vdi' (around 5 seconds)....
-Creating VM 'macOS-Mojave' (around 2 seconds)....
-Adding APFS drivers to EFI in '/Users/awi/VirtualBox VMs/macOS-Mojave/macOS-Mojave.vdi' (around 5 seconds)....
-Starting VM 'macOS-Mojave' (3 minutes in the VM)....
-Press enter to stop VM 'macOS-Mojave' (e.g. after installer restarted)....
-
-Ejecting installer DVD for VM 'macOS-Mojave'....
-Starting VM 'macOS-Mojave' (3 minutes in the VM)....
+Creating image '/Users/awi/VirtualBox VMs/macOS-VM.dmg' (around 20 seconds, version 14.2.2, will need sudo)....
+Creating iso '/Users/awi/VirtualBox VMs/macOS-VM.iso.cdr' (around 25 seconds)....
+Creating VM HDD '/Users/awi/VirtualBox VMs/macOS-VM/macOS-VM.vdi' (around 5 seconds)....
+Creating VM 'macOS-VM' (around 2 seconds)....
+Adding APFS drivers to EFI in '/Users/awi/VirtualBox VMs/macOS-VM/macOS-VM.vdi' (around 5 seconds)....
+Starting VM 'macOS-VM' (3 minutes in the VM)....
+Press enter to stop VM 'macOS-VM' (e.g. after installer restarted)....
+
+Ejecting installer DVD for VM 'macOS-VM'....
+Starting VM 'macOS-VM' (3 minutes in the VM)....
 ```
 
 ### Customizing your build
@@ -53,7 +53,7 @@ Additionally the following parameters can be customized with environment variabl
 
 | variable name | description                                         | default value                |
 |---------------|-----------------------------------------------------|------------------------------|
-| VM_NAME       | name of the virtual machine                         | macOS-Mojave                 |
+| VM_NAME       | name of the virtual machine                         | macOS-VM                 |
 | VM_DIR        | directory, where the virtual machine will be stored | HOME/VirtualBox VMs/$VM_NAME |
 | VM_SIZE       | the size of the hard disk                           | 32768                        |
 | VM_RES        | monitor resolution                                  | 1680x1050                    |
@@ -70,8 +70,7 @@ Some available commands:
  * all      : run everything needed (check, installer, vm, patch, run, stop, eject)
  * check    : check environment
  * installer: create macOS installer image
- * clover   : create clover boot image
- * patch    : add APFS drivers to VM EFI to boot w/o clover
+ * patch    : add APFS drivers to VM EFI to boot
  * vm       : create VM and disk
  * run      : run VM
  * stop     : stop VM