From 26e16ed6719fae06ab96dc6606a8b06869a311e3 Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Thu, 23 Apr 2026 17:42:22 +0200
Subject: [PATCH] change builder script with submethods

---
 builder/build-in-container | 47 +++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 13 deletions(-)

diff --git a/builder/build-in-container b/builder/build-in-container
index b247851..db18b3c 100755
--- a/builder/build-in-container
+++ b/builder/build-in-container
@@ -1,26 +1,47 @@
 #!/bin/bash
 
-main()
+create_containerfile()
 {
+	local distro="$1"
 	local scriptpath=$(echo $0 | xargs dirname | xargs realpath)
+
+	cat $scriptpath/Containerfile.template \
+		| sed "s/\$distro/$distro/" \
+		> build/Containerfile-$distro_postfix
+}
+
+build_container_image()
+{
+	local distro_postfix="$1"
+
+	podman build \
+		-f build/Containerfile-$distro_postfix \
+		-t sane-kds-s2000w-net-builder-$distro_postfix
+}
+
+run_builder_container()
+{
+	local distro_postfix="$1"
+
+	podman run \
+		--rm \
+		-v ./:/source \
+		-e EXTRA_VERSION=$distro_postfix \
+		sane-kds-s2000w-net-builder-$distro_postfix \
+		|| return $?
+}
+
+main()
+{
 	local distros="debian:bookworm debian:trixie debian:forky ubuntu:noble"
 	mkdir -p build
 	cp builder/run build/
 
 	for distro in $distros; do
 		local distro_postfix=${distro/:/-}
-		cat $scriptpath/Containerfile.template \
-			| sed "s/\$distro/$distro/" \
-			> build/Containerfile-$distro_postfix
-		podman build \
-			-f build/Containerfile-$distro_postfix \
-			-t sane-kds-s2000w-net-builder-$distro_postfix
-		podman run \
-			--rm \
-			-v ./:/source \
-			-e EXTRA_VERSION=$distro_postfix \
-			sane-kds-s2000w-net-builder-$distro_postfix \
-			|| return $?
+		create_containerfile "$distro"
+		build_container_image "$distro_postfix"
+		run_builder_container "$distro_postfix"
 	done
 }
 
-- 
2.47.3