refactor: harden diagnostics and consolidate runtime code

iso/builder/build.sh

@@ -77,6 +77,7 @@ export GOCACHE GOMODCACHE
 # Keep the entrypoint focused on build orchestration. These libraries only
 # define helpers; stateful logging is loaded after its output paths are known.
 . "${BUILDER_DIR}/lib/iso-validation.sh"
+. "${BUILDER_DIR}/lib/template.sh"
 . "${BUILDER_DIR}/lib/bootloader.sh"
 . "${BUILDER_DIR}/lib/fast-path.sh"
 
@@ -158,11 +159,19 @@ sync_builder_workdir() {
 
 
 PROJECT_VERSION_EFFECTIVE="$(resolve_project_version)"
+if ! validate_project_version "${PROJECT_VERSION_EFFECTIVE}"; then
+    echo "ERROR: project version must start and end with an ASCII letter or digit and contain only letters, digits, dots, and hyphens: ${PROJECT_VERSION_EFFECTIVE}" >&2
+    exit 1
+fi
 SQUASHFS_FILENAME="filesystem-v${PROJECT_VERSION_EFFECTIVE}.squashfs"
 ISO_BASENAME="easy-bee-${BUILD_VARIANT}-v${PROJECT_VERSION_EFFECTIVE}-amd64"
 # Hostname baked into the live image: same product+version scheme as
 # ISO_BASENAME/SQUASHFS_FILENAME, but hostname labels don't allow dots.
 BEE_HOSTNAME="easy-bee-${BUILD_VARIANT}-v$(printf '%s' "${PROJECT_VERSION_EFFECTIVE}" | tr '.' '-')"
+if [ "${#BEE_HOSTNAME}" -gt 63 ]; then
+    echo "ERROR: derived hostname exceeds the 63-byte DNS label limit: ${BEE_HOSTNAME}" >&2
+    exit 1
+fi
 # Versioned output directory: dist/easy-bee-v4.1/ - all final artifacts live here.
 OUT_DIR="${DIST_DIR}/release/easy-bee-v${PROJECT_VERSION_EFFECTIVE}"
 ISO_VERSION_LABEL_TOKEN="$(printf '%s' "${PROJECT_VERSION_EFFECTIVE}" | tr '[:lower:].-' '[:upper:]__')"
@@ -538,9 +547,7 @@ fi
 # Patch motd with build info
 BEE_BUILD_INFO="${BUILD_DATE} git:${GIT_COMMIT} debian:${DEBIAN_VERSION} ${GPU_BUILD_INFO}"
 if [ -f "${OVERLAY_STAGE_DIR}/etc/motd" ]; then
-    sed "s/%%BUILD_INFO%%/${BEE_BUILD_INFO}/" "${OVERLAY_STAGE_DIR}/etc/motd" \
-        > "${OVERLAY_STAGE_DIR}/etc/motd.patched"
-    mv "${OVERLAY_STAGE_DIR}/etc/motd.patched" "${OVERLAY_STAGE_DIR}/etc/motd"
+    replace_literal_in_file "${OVERLAY_STAGE_DIR}/etc/motd" "%%BUILD_INFO%%" "${BEE_BUILD_INFO}"
 fi
 
 # --- copy variant-specific package list, remove all other variant lists ---
@@ -568,26 +575,24 @@ fi
 
 # --- substitute version placeholders in package list and archive ---
 if [ "$BEE_GPU_VENDOR" = "nvidia" ]; then
-    sed -i \
-        -e "s/%%NVIDIA_FABRICMANAGER_VERSION%%/${NVIDIA_FABRICMANAGER_VERSION}/g" \
-        -e "s/%%DCGM_VERSION%%/${DCGM_VERSION}/g" \
-        "${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
+    replace_literal_in_file "${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot" \
+        "%%NVIDIA_FABRICMANAGER_VERSION%%" "${NVIDIA_FABRICMANAGER_VERSION}"
+    replace_literal_in_file "${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot" \
+        "%%DCGM_VERSION%%" "${DCGM_VERSION}"
 elif [ "$BEE_GPU_VENDOR" = "amd" ]; then
-    sed -i \
-        -e "s/%%ROCM_VERSION%%/${ROCM_VERSION}/g" \
-        -e "s/%%ROCM_SMI_VERSION%%/${ROCM_SMI_VERSION}/g" \
-        -e "s/%%ROCM_BANDWIDTH_TEST_VERSION%%/${ROCM_BANDWIDTH_TEST_VERSION}/g" \
-        -e "s/%%ROCM_VALIDATION_SUITE_VERSION%%/${ROCM_VALIDATION_SUITE_VERSION}/g" \
-        -e "s/%%ROCBLAS_VERSION%%/${ROCBLAS_VERSION}/g" \
-        -e "s/%%ROCRAND_VERSION%%/${ROCRAND_VERSION}/g" \
-        -e "s/%%HIP_RUNTIME_AMD_VERSION%%/${HIP_RUNTIME_AMD_VERSION}/g" \
-        -e "s/%%HIPBLASLT_VERSION%%/${HIPBLASLT_VERSION}/g" \
-        -e "s/%%COMGR_VERSION%%/${COMGR_VERSION}/g" \
-        "${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
+    gpu_package_list="${BUILD_WORK_DIR}/config/package-lists/bee-gpu.list.chroot"
+    replace_literal_in_file "$gpu_package_list" "%%ROCM_VERSION%%" "${ROCM_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%ROCM_SMI_VERSION%%" "${ROCM_SMI_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%ROCM_BANDWIDTH_TEST_VERSION%%" "${ROCM_BANDWIDTH_TEST_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%ROCM_VALIDATION_SUITE_VERSION%%" "${ROCM_VALIDATION_SUITE_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%ROCBLAS_VERSION%%" "${ROCBLAS_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%ROCRAND_VERSION%%" "${ROCRAND_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%HIP_RUNTIME_AMD_VERSION%%" "${HIP_RUNTIME_AMD_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%HIPBLASLT_VERSION%%" "${HIPBLASLT_VERSION}"
+    replace_literal_in_file "$gpu_package_list" "%%COMGR_VERSION%%" "${COMGR_VERSION}"
     if [ -f "${BUILD_WORK_DIR}/config/archives/rocm.list.chroot" ]; then
-        sed -i \
-            -e "s/%%ROCM_VERSION%%/${ROCM_VERSION}/g" \
-            "${BUILD_WORK_DIR}/config/archives/rocm.list.chroot"
+        replace_literal_in_file "${BUILD_WORK_DIR}/config/archives/rocm.list.chroot" \
+            "%%ROCM_VERSION%%" "${ROCM_VERSION}"
     fi
 fi