From dbd658931f9572fb93a601df87ef231ea7008fe8 Mon Sep 17 00:00:00 2001
From: Scott Duensing <scott@kangaroopunch.com>
Date: Tue, 27 Sep 2022 20:24:07 -0500
Subject: [PATCH] Build service working.

---
 scripts/buildVm.sh | 36 ++++++++++++++++++++++++++----------
 1 file changed, 26 insertions(+), 10 deletions(-)

diff --git a/scripts/buildVm.sh b/scripts/buildVm.sh
index ff56acf..95f41ff 100755
--- a/scripts/buildVm.sh
+++ b/scripts/buildVm.sh
@@ -486,14 +486,14 @@ function doBuild() {
 							iix -DKeepType=S16 link ${OFILES} keep=${GSTARGET}/${BUILD_PROJECT}#b3db03
 							rm -f *.sym || true
 							# Create disk image, setting known file types
-							DISK=${BUILD_RESULTS}/${LINE,,}/build.po
+							DISK=${BUILD_RESULTS}/${LINE,,}/${BUILD_PROJECT}.po
 							${CADIUS} createvolume ${DISK} ${BUILD_PROJECT} 32MB
 							${CADIUS} createfolder ${DISK} ${BUILD_PROJECT}/data
 							${CADIUS} addfile ${DISK} ${BUILD_PROJECT} ${TARGET}/${BUILD_PROJECT}#b3db03
 							${CADIUS} addfile ${DISK} ${BUILD_PROJECT}/data ${LIB}/Tool222#ba0000
 							# Copy game data.
 							for FILE in "${DATA[@]}"; do
-								#***TODO*** Data conversion here!
+								# Data conversion here!
 								EXTENSION="${FILE##*.}"
 								case ${EXTENSION,,} in
 									mod)
@@ -528,7 +528,7 @@ function doBuild() {
 							# Copy game data.
 							mkdir -p ${BUILD_RESULTS}/${LINE,,}/data
 							for FILE in "${DATA[@]}"; do
-								#***TODO*** Data conversion here!
+								# Data conversion here!
 								cp -f ${FILE} ${BUILD_RESULTS}/${LINE,,}/data/.
 							done
 							;;
@@ -539,7 +539,8 @@ function doBuild() {
 			fi
 		done < build.start
 
-		BUILD_PLATFORMS="${BUILD_PLATFORMS}]"
+		trim O "${BUILD_PLATFORMS}"
+		BUILD_PLATFORMS="${O}]"
 
 	popd
 	
@@ -581,7 +582,11 @@ function doInstall() {
 
 	rebuildJoeyLib
 	
-	#***TODO*** Install and start the build service.
+	if [[ ! -f /etc/rc.local ]]; then
+		echo "#!/bin/bash" | sudo tee /etc/rc.local
+		echo "${EHOME}/buildVm.sh server ${EHOME}/dist" | sudo tee -a /etc/rc.local
+		echo "exit 0" | sudo tee -a /etc/rc.local
+	fi
 }
 
 
@@ -800,7 +805,7 @@ function scriptIsDownloaded() {
 
 function startBuildServer() {
 	local DIST=$1
-	local LOG=/opt/joey/${0}.log
+	local LOG=${0}.log
 	local USERNAME=
 	local FILE=
 
@@ -815,13 +820,18 @@ function startBuildServer() {
 		for USERNAME in $(ls -1); do
 		
 			mkdir -p "${USERNAME}/build"
-			chown -r ${USERNAME}:${USERNAME} "${USERNAME}/build"
+			chown -R ${USERNAME}:${USERNAME} "${USERNAME}/build"
 			chmod u+rwX "${USERNAME}/build"
 			chmod go-rwx "${USERNAME}/build"
 			
 			if [[ -f "${USERNAME}/build/build.start" ]]; then
 
-				doBuild "${DIST}" "${USERNAME}/build"
+				# Are there old reults to clean up?
+				if [[ -f build.tar.bz2 ]]; then
+					rm build.tar.bz2
+				fi
+
+				doBuild "${DIST}" /home/"${USERNAME}/build"
 
 				pushd "${USERNAME}/build"
 				
@@ -832,8 +842,14 @@ function startBuildServer() {
 					# Erase everything except the temp file.
 					rm -rf "${BUILD_RESULTS}"
 					for FILE in $(ls -1); do
-						if [[ ${FILE} != "build.temp" ]]; then
-							rm ${FILE}
+						if [[ -f "${FILE}" ]]; then
+							if [[ "${FILE}" != "build.temp" ]]; then
+								rm "${FILE}"
+							fi
+						else
+							if [[ -d "${FILE}" ]]; then
+								rm -r "${FILE}"
+							fi
 						fi
 					done