From 8bb44d5fba8c428c61e958843922016501676a43 Mon Sep 17 00:00:00 2001
From: Steve McIntyre <steve@einval.com>
Date: Thu, 15 Feb 2024 01:42:12 +0000
Subject: [PATCH] Fix counting of images at build time

Closes: #1063858
(cherry picked from commit 64c59791cf6d6bd2887221dd96a26f1fdf620639)
---
 debian/changelog | 1 +
 tools/make_image | 4 +---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 726a70a7..d3372e9e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ debian-cd (3.2.1+deb12u1) UNRELEASED; urgency=medium
     control which packages are included - see
     tasks/$codename/firmware-exclude. Closes: #1032071
   * Tweak sizes slightly for BD media.
+  * Fix counting of images at build time. Closes: #1063858
 
   [ Guido Berhoerster ]
   * Update DebianEdu installer banner and syslinux splash image
diff --git a/tools/make_image b/tools/make_image
index 234c8ce0..0cd3fa21 100755
--- a/tools/make_image
+++ b/tools/make_image
@@ -19,13 +19,11 @@ NUM_ARCHES=`echo $ARCHES | wc -w`
 
 if [ "$CD"x = ""x ] ; then
     echo "Generating the $ARCHES iso/jigdo images ..."
-    FILES=$DIR/*.volid
 else
     echo "Generating $ARCHES iso/jigdo image number $CD ..."
-    FILES=$DIR/$CD.volid
 fi
 
-NUM_CDS=`ls -1 $FILES | wc -l`
+NUM_CDS=$(ls -1 $DIR/*.volid | wc -l)
 
 last_minute_update () {
     echo "  Last-minute updates:"