From a97db97dc453f6f9678372adbde8de37f289f0e1 Mon Sep 17 00:00:00 2001
From: Jack <31696646+myspaghetti@users.noreply.github.com>
Date: Mon, 20 Apr 2020 12:01:07 +0300
Subject: [PATCH] added earlier failure detection for BaseSystem.vdi

---
 macos-guest-virtualbox.sh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/macos-guest-virtualbox.sh b/macos-guest-virtualbox.sh
index 251797f..227ba6a 100755
--- a/macos-guest-virtualbox.sh
+++ b/macos-guest-virtualbox.sh
@@ -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