From 080cfad2bf772c692de06e9282b39f008031ae27 Mon Sep 17 00:00:00 2001
From: Bohdan Buinich <bohdan.buinich@gmail.com>
Date: Mon, 8 Jan 2024 00:50:44 +0200
Subject: [PATCH] [RPI] Refactor Image Generation Script for Clarity and
 Modularization

- Reorganized variable definitions for clarity and consistency.
- Encapsulated SWU file creation logic into 'create_swu_file' function for better modularity and readability.
- Implemented 'cleanup' function to handle temporary file cleanup, enhancing script robustness.
- Utilized bash array for 'SWUPDATE_FILES' to improve handling of multiple file entries.
- Simplified error handling with 'set -e' and streamlined script exit using 'trap' for cleanup operations.
- Cleaned up directory changing commands by redirecting 'pushd' and 'popd' output to '/dev/null'.
---
 .../board/ovos/raspberrypi/post-image.sh      | 72 +++++++++++++------
 1 file changed, 51 insertions(+), 21 deletions(-)

diff --git a/buildroot-external/board/ovos/raspberrypi/post-image.sh b/buildroot-external/board/ovos/raspberrypi/post-image.sh
index b572c4b4..0d73c9ed 100755
--- a/buildroot-external/board/ovos/raspberrypi/post-image.sh
+++ b/buildroot-external/board/ovos/raspberrypi/post-image.sh
@@ -2,33 +2,63 @@
 
 set -e
 
-BOARD_DIR="$(dirname $0)"
-BOARD_NAME="$(basename ${BOARD_DIR})"
+# Define board directory and related variables
+BOARD_DIR="$(dirname "$0")"
+BOARD_NAME="$(basename "${BOARD_DIR}")"
 GENIMAGE_CFG="${BOARD_DIR}/genimage-${BOARD_NAME}.cfg"
 GENIMAGE_TMP="${BUILD_DIR}/genimage.tmp"
-SWUPDATE_FILES="sw-description rootfs.squashfs"
 
-# Pass an empty rootpath. genimage makes a full copy of the given rootpath to
-# ${GENIMAGE_TMP}/root so passing TARGET_DIR would be a waste of time and disk
-# space. We don't rely on genimage to build the rootfs image, just to insert a
-# pre-built one in the disk image.
+# Define files for SWUPDATE
+SWUPDATE_FILES=("sw-description" "rootfs.squashfs")
 
-trap 'rm -rf "${ROOTPATH_TMP}"' EXIT
+# Check if necessary files and directories exist
+if [ ! -d "${BUILD_DIR}" ] || [ ! -f "${GENIMAGE_CFG}" ]; then
+    echo "Required directories or config files are missing."
+    exit 1
+fi
+
+# Function to create SWU file
+create_swu_file() {
+    local binaries_dir=$1
+    shift
+    local files=("$@")
+
+    pushd "${binaries_dir}" > /dev/null
+    printf '%s\n' "${files[@]}" | cpio -ov -H crc > rootfs.swu
+    if [ $? -ne 0 ]; then
+        echo "Error creating SWU file."
+        exit 1
+    fi
+    popd > /dev/null
+}
+
+# Clean up function for EXIT trap
+cleanup() {
+    echo "Cleaning up temporary files."
+    rm -rf "${ROOTPATH_TMP}"
+    rm -rf "${GENIMAGE_TMP}"
+}
+
+# Setting up trap for cleanup on script exit
+trap cleanup EXIT
+
+# Create temporary root path
 ROOTPATH_TMP="$(mktemp -d)"
 
-rm -rf "${GENIMAGE_TMP}"
-
+# Generate image using genimage
+echo "Generating image with genimage..."
 genimage \
-	--rootpath "${ROOTPATH_TMP}"   \
-	--tmppath "${GENIMAGE_TMP}"    \
-	--inputpath "${BINARIES_DIR}"  \
-	--outputpath "${BINARIES_DIR}" \
-	--config "${GENIMAGE_CFG}"
+    --rootpath "${ROOTPATH_TMP}" \
+    --tmppath "${GENIMAGE_TMP}" \
+    --inputpath "${BINARIES_DIR}" \
+    --outputpath "${BINARIES_DIR}" \
+    --config "${GENIMAGE_CFG}"
 
-pushd ${BINARIES_DIR}
-for f in ${SWUPDATE_FILES} ; do
-	echo ${f}
-done | cpio -ov -H crc > rootfs.swu
-popd
+if [ $? -ne 0 ]; then
+    echo "Error during image generation."
+    exit 1
+fi
 
-exit $?
+# Create SWU file
+echo "Creating SWU file..."
+create_swu_file "${BINARIES_DIR}" "${SWUPDATE_FILES[@]}"