From a7bdbf320a4d44f8b9a62bbfdb092bb47c9ffe49 Mon Sep 17 00:00:00 2001
From: Jack <31696646+myspaghetti@users.noreply.github.com>
Date: Thu, 12 Dec 2019 00:15:01 +0200
Subject: [PATCH] removed Catalina workaround; currently doesn't work

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

diff --git a/macos-guest-virtualbox.sh b/macos-guest-virtualbox.sh
index 7879fc7..04f449d 100644
--- a/macos-guest-virtualbox.sh
+++ b/macos-guest-virtualbox.sh
@@ -2,7 +2,7 @@
 # Semi-automatic installer of macOS on VirtualBox
 # (c) myspaghetti, licensed under GPL2.0 or higher
 # url: https://github.com/myspaghetti/macos-guest-virtualbox
-# version 0.76.6
+# version 0.76.7
 
 # Requirements: 40GB available storage on host
 # Dependencies: bash >= 4.0, unzip, wget, dmg2img,
@@ -380,16 +380,9 @@ a package named '"${white_on_black}"'ca-certificates'"${default_color}"
 fi
 echo "Trying to find macOS ${macOS_release_name} InstallAssistant download URL"
 tac "${macOS_release_name}_sucatalog" | csplit - '/InstallAssistantAuto.smd/+1' '{*}' -f "${macOS_release_name}_sucatalog_" -s
-###
-# BELOW IS AN EMERGENCY WORKAROUND THAT AVOIDS CATALINA 10.15.2.0.0.1575534587
-###
-rm Catalina_sucatalog_00 2>/dev/null
-# The above removes the lastest match of the Catalina installer,
-# and instead relies on the next-to-latest match. This won't work
-# when a new version is released. It's a temporary emergency workaround.
 for catalog in "${macOS_release_name}_sucatalog_"* "error"; do
     if [[ "${catalog}" == error ]]; then
-        # rm "${macOS_release_name}_sucatalog"*
+        rm "${macOS_release_name}_sucatalog"*
         printf "Couldn't find the requested download URL in the Apple catalog. Exiting."
        exit
     fi
@@ -402,7 +395,7 @@ for catalog in "${macOS_release_name}_sucatalog_"* "error"; do
     if [[ "${found_version}" == *${CFBundleShortVersionString}* ]]; then
         echo "Found download URL: ${urlbase}"
         echo ""
-        # rm "${macOS_release_name}_sucatalog"*
+        rm "${macOS_release_name}_sucatalog"*
         break
     fi
 done