Dark-Alex-17/macos-virtualbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added earlier failure detection for BaseSystem.vdi

Browse Source
This commit is contained in:
Jack
2020-04-20 12:01:07 +03:00
parent fbb4dbe77d
commit a97db97dc4
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
macos-guest-virtualbox.sh
+10 -6
View File
@@ -2,7 +2,7 @@
# Push-button installer of macOS on VirtualBox
# (c) myspaghetti, licensed under GPL2.0 or higher
# url: https://github.com/myspaghetti/macos-guest-virtualbox
# version 0.89.9
# version 0.90.0
# Dependencies: bash coreutils gzip unzip wget xxd dmg2img
# Supported versions:
@@ -633,14 +633,18 @@ elif [[ ! -s "${macOS_release_name}_BaseSystem.dmg" ]]; then
echo "Could not find ${macOS_release_name}_BaseSystem.dmg; exiting."
exit
else
echo "Converting to BaseSystem.dmg to BaseSystem.img"
local failed=''
echo "Converting BaseSystem.dmg to BaseSystem.img"
if [[ -n "$("${PWD}/dmg2img.exe" -d 2>/dev/null)" ]]; then
"${PWD}/dmg2img.exe" "${macOS_release_name}_BaseSystem.dmg" "${macOS_release_name}_BaseSystem.img"
"${PWD}/dmg2img.exe" "${macOS_release_name}_BaseSystem.dmg" "${macOS_release_name}_BaseSystem.img" || local failed='failed'
else
dmg2img "${macOS_release_name}_BaseSystem.dmg" "${macOS_release_name}_BaseSystem.img"
dmg2img "${macOS_release_name}_BaseSystem.dmg" "${macOS_release_name}_BaseSystem.img" || local failed='failed'
fi
VBoxManage convertfromraw --format VDI "${macOS_release_name}_BaseSystem.img" "${macOS_release_name}_BaseSystem.vdi"
if [[ -s "${macOS_release_name}_BaseSystem.vdi" ]]; then
VBoxManage convertfromraw --format VDI "${macOS_release_name}_BaseSystem.img" "${macOS_release_name}_BaseSystem.vdi" || local failed='failed'
if [[ -n "${failed}" ]]; then
echo "Failed to create \"${macOS_release_name}_BaseSystem.vdi\". Exiting."
exit
else
rm "${macOS_release_name}_BaseSystem.img" 2>/dev/null
fi
fi