Restructure

build.sh

@@ -144,7 +144,7 @@ run_stage() {
 	unmount "${WORK_DIR}/${STAGE}"
 
 	if [ ! -f SKIP_IMAGES ]; then
-		if [ -f "${STAGE_DIR}/EXPORT_IMAGE" ] || [ -f "${STAGE_DIR}/EXPORT_ISO" ] || [ -f "${STAGE_DIR}/EXPORT_SQUASHFS" ]; then
+		if [ -f "${STAGE_DIR}/EXPORT_IMG" ] || [ -f "${STAGE_DIR}/EXPORT_ISO" ] || [ -f "${STAGE_DIR}/EXPORT_SQUASHFS" ] || [ -f "${STAGE_DIR}/EXPORT_NOOBS" ]; then
 			EXPORT_DIRS="${EXPORT_DIRS} ${STAGE_DIR}"
 		fi
 	fi
@@ -184,7 +184,7 @@ term() {
 		log "Build finished"
 	fi
 	unmount "${STAGE_WORK_DIR}"
-	if [ "$STAGE" = "export-image" ]; then
+	if [ "$STAGE" = "exports/img" ]; then
 		for img in "${STAGE_WORK_DIR}/"*.img; do
 			unmount_image "$img"
 		done
@@ -332,11 +332,7 @@ log "Begin ${BASE_DIR}"
 STAGE_LIST=${STAGE_LIST:-${BASE_DIR}/stage*}
 export STAGE_LIST
 
-EXPORT_CONFIG_DIR=$(realpath "${EXPORT_CONFIG_DIR:-"${BASE_DIR}/export-image"}")
-if [ ! -d "${EXPORT_CONFIG_DIR}" ]; then
-	echo "EXPORT_CONFIG_DIR invalid: ${EXPORT_CONFIG_DIR} does not exist"
-	exit 1
-fi
+EXPORT_CONFIG_DIR="${EXPORT_CONFIG_DIR:-"${BASE_DIR}/exports"}"
 export EXPORT_CONFIG_DIR
 
 for STAGE_DIR in $STAGE_LIST; do
@@ -351,18 +347,18 @@ for EXPORT_DIR in ${EXPORT_DIRS}; do
 		STAGE_DIR=${EXPORT_CONFIG_DIR}
 		# shellcheck source=/dev/null
 		source "${EXPORT_DIR}/EXPORT_ISO"
-		STAGE_DIR="${BASE_DIR}/export-iso"
+		STAGE_DIR="${BASE_DIR}/exports/iso"
 		run_stage
 	fi
-	if [ -e "${EXPORT_DIR}/EXPORT_IMAGE" ]; then
+	if [ -e "${EXPORT_DIR}/EXPORT_IMG" ]; then
 		STAGE_DIR=${EXPORT_CONFIG_DIR}
 		# shellcheck source=/dev/null
-		source "${EXPORT_DIR}/EXPORT_IMAGE"
-		STAGE_DIR="${BASE_DIR}/export-image"
+		source "${EXPORT_DIR}/EXPORT_IMG"
+		STAGE_DIR="${BASE_DIR}/exports/img"
 		run_stage
 	fi
 	if [ -e "${EXPORT_DIR}/EXPORT_SQUASHFS" ]; then
-		STAGE_DIR="${BASE_DIR}/export-squashfs"
+		STAGE_DIR="${BASE_DIR}/exports/squashfs"
 		run_stage
 	fi
 	if [ "${USE_QEMU}" != "1" ]; then