From c34218190899db43e07f782d40d0d0087d7f417c Mon Sep 17 00:00:00 2001
From: MickLesk <mickey.leskowitz@gmail.com>
Date: Mon, 27 Jul 2026 10:16:38 +0200
Subject: [PATCH] Fix pveam template version parsing

pveam available outputs "<section>\t<template>", so the template name is field 2, not field 1. Switch both version-listing pipelines from `awk -F'\t' '{print $1}'` to `awk '{print $2}'` and anchor the grep/sed patterns to the start of the template name.

Also add `|| true` to each pipeline to prevent a non-zero exit (no matches) from triggering the ERR trap under pipefail inside process substitutions, and fix a missing `-e` flag on an echo with escape sequences.
---
 misc/build.func | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/misc/build.func b/misc/build.func
index 5ad76044e..31e641591 100644
--- a/misc/build.func
+++ b/misc/build.func
@@ -6486,20 +6486,24 @@ create_lxc_container() {
     if [[ -z "$TEMPLATE" ]]; then
       msg_warn "No template found for ${PCT_OSTYPE} ${PCT_OSVERSION}, searching for alternatives..."
 
-      # Get all available versions for this OS type
+      # Get all available versions for this OS type.
+      # `pveam available` prints "<section>\t<template>", so the name is field 2.
+      # The trailing `|| true` is required: without a match the pipeline exits non-zero
+      # under pipefail, the ERR trap fires inside the process substitution and mapfile
+      # would swallow the error handler's log dump as if it were version entries.
       AVAILABLE_VERSIONS=()
       mapfile -t AVAILABLE_VERSIONS < <(
         pveam available -section system 2>/dev/null |
           grep -E '\.(tar\.zst|tar\.xz|tar\.gz)$' |
-          awk -F'\t' '{print $1}' |
-          grep "^${PCT_OSTYPE}-" |
-          sed -E "s/.*${PCT_OSTYPE}-([0-9]+(\.[0-9]+)?).*/\1/" |
-          sort -u -V 2>/dev/null
+          awk '{print $2}' |
+          grep -E "^${PCT_OSTYPE}-" |
+          sed -E "s/^${PCT_OSTYPE}-([0-9]+(\.[0-9]+)?).*/\1/" |
+          sort -u -V || true
       )
 
       if [[ ${#AVAILABLE_VERSIONS[@]} -gt 0 ]]; then
         echo ""
-        echo "${BL}Available ${PCT_OSTYPE} versions:${CL}"
+        echo -e "${BL}Available ${PCT_OSTYPE} versions:${CL}"
         for i in "${!AVAILABLE_VERSIONS[@]}"; do
           echo "  [$((i + 1))] ${AVAILABLE_VERSIONS[$i]}"
         done
@@ -6551,13 +6555,15 @@ create_lxc_container() {
       if [[ -z "$TEMPLATE" ]]; then
         msg_error "Template ${PCT_OSTYPE} ${PCT_OSVERSION} not available"
 
-        # Get available versions
+        # Get available versions (see the note above: field 2 holds the template name,
+        # and the pipeline must not fail the ERR trap when nothing matches)
         mapfile -t AVAILABLE_VERSIONS < <(
           pveam available -section system 2>/dev/null |
-            grep "^${PCT_OSTYPE}-" |
-            sed -E 's/.*'"${PCT_OSTYPE}"'-([0-9]+\.[0-9]+).*/\1/' |
-            grep -E '^[0-9]+\.[0-9]+$' |
-            sort -u -V 2>/dev/null || sort -u
+            grep -E '\.(tar\.zst|tar\.xz|tar\.gz)$' |
+            awk '{print $2}' |
+            grep -E "^${PCT_OSTYPE}-" |
+            sed -E "s/^${PCT_OSTYPE}-([0-9]+(\.[0-9]+)?).*/\1/" |
+            sort -u -V || true
         )
 
         if [[ ${#AVAILABLE_VERSIONS[@]} -gt 0 ]]; then