From a93c83c32e61352ff47842cd4100c3f81623b958 Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Wed, 16 Jun 2021 20:45:44 -0500
Subject: [PATCH] Still working on automating VM building for JoeyDev.

---
 joeylib/src/jSDL2.c  |  2 ++
 scripts/installer.sh | 41 ++++++++++++++++++++++-------------------
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/joeylib/src/jSDL2.c b/joeylib/src/jSDL2.c
index 07f8495..342e078 100644
--- a/joeylib/src/jSDL2.c
+++ b/joeylib/src/jSDL2.c
@@ -484,4 +484,6 @@ int main(int argc, char *argv[]) {
 
 		jlUtilDie("Clean Exit.");
 	}
+
+	return 0;
 }
diff --git a/scripts/installer.sh b/scripts/installer.sh
index c35cfd2..d2a6db6 100755
--- a/scripts/installer.sh
+++ b/scripts/installer.sh
@@ -61,13 +61,13 @@ function buildMacOSXSDK() {
 	if [[ ! -z ${G_AUTOMATED} ]]; then
 		XCODE=${G_XCODE_FILE}
 		if [[ ! -e "${XCODE}" ]]; then
-			return 0
+			return 1
 		fi
 	else
 		if [[ ! -e "${OSX}/SDK" ]]; then
 			tFileBrowser XCODE "Please locate your XCode XIP" .xip ..
 			if [[ -z ${XCODE} || "${XCODE}" == "" ]]; then
-				return 0
+				return 1
 			fi
 		fi
 	fi
@@ -87,6 +87,8 @@ function buildMacOSXSDK() {
 	G_IS_INSTALLED[$G_MAC64]=1
 	configWrite
 	configRead
+
+	return 0
 }
 
 
@@ -462,7 +464,7 @@ function installIIgs() {
 		echo "#!/bin/bash" > "${O}"
 		echo "IIGS=${IIGS}" >> "${O}"
 		echo "if ! mount | grep \${IIGS}/ORCA | grep -q hfsplus; then" >> "${O}"
-		echo -e "\tfsck.hfsplus \${IIGS}/hfsDrive.img" >> "${O}"
+		echo -e "\tfsck.hfsplus -dfary \${IIGS}/hfsDrive.img" >> "${O}"
 		echo -e "\tIIGSDISK=\$(sudo losetup --partscan --find --show \${IIGS}/hfsDrive.img)" >> "${O}"
 		echo -e "\tsudo mount \${IIGSDISK} \${IIGS}/ORCA" >> "${O}"
 		echo -e "\techo LOOP=\${IIGSDISK} > \${IIGS}/lastMount.cfg" >> "${O}"
@@ -481,6 +483,7 @@ function installIIgs() {
 		chmod +x "${O}"
 		fallocate -l 32M "${IIGS}/hfsDrive.img"
 		mkfs.hfs -v IIgs "${IIGS}/hfsDrive.img"
+		fsck.hfsplus -dfary "${IIGS}/hfsDrive.img"
 	fi
 
 	"${IIGS}/mountORCA.sh"
@@ -681,26 +684,26 @@ function installLinux64() {
 
 
 function installmacOS32() {
-	buildMacOSXSDK
-	buildPCDeps \
-		"macos32" \
-		"macOS/i386" \
-		"i386-apple-darwin${G_OSX_DARWIN}" \
-		"o32-clang" \
-		"" \
-		"${JOEY}/sdks/macOS/lib"
+	buildMacOSXSDK && \
+		buildPCDeps \
+			"macos32" \
+			"macOS/i386" \
+			"i386-apple-darwin${G_OSX_DARWIN}" \
+			"o32-clang" \
+			"" \
+			"${JOEY}/sdks/macOS/lib"
 }
 
 
 function installmacOS64() {
-	buildMacOSXSDK
-	buildPCDeps \
-		"macos64" \
-		"macOS/x64" \
-		"x86_64-apple-darwin${G_OSX_DARWIN}" \
-		"o64-clang" \
-		"" \
-		"${JOEY}/sdks/macOS/lib"
+	buildMacOSXSDK && \
+		buildPCDeps \
+			"macos64" \
+			"macOS/x64" \
+			"x86_64-apple-darwin${G_OSX_DARWIN}" \
+			"o64-clang" \
+			"" \
+			"${JOEY}/sdks/macOS/lib"
 }