From: Bastian Dehn <hhaalo@arcor.de>
Date: Fri, 24 Apr 2026 14:54:31 +0000 (+0200)
Subject: optimize builder script
X-Git-Tag: v1.1.28^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=73aa6b93aa7f9ecdd815f9a5dbfd962f54e1b961;p=sane-kds-s2000w-net.git

optimize builder script
---

diff --git a/builder/builder b/builder/builder
index 6a28b8c..a278542 100755
--- a/builder/builder
+++ b/builder/builder
@@ -3,11 +3,12 @@
 create_containerfile()
 {
 	local distro="$1"
-	local scriptpath=$(echo $0 | xargs dirname | xargs realpath)
+	local distro_postfix="$2"
 
-	cat $scriptpath/Containerfile.template \
+	cat builder/Containerfile.template \
 		| sed "s/\$distro/$distro/" \
-		> build/Containerfile-$distro_postfix
+		> build/Containerfile-$distro_postfix \
+		|| return $?
 }
 
 build_container_image()
@@ -15,8 +16,9 @@ build_container_image()
 	local distro_postfix="$1"
 
 	podman build \
+		-t sane-kds-s2000w-net-builder-$distro_postfix \
 		-f build/Containerfile-$distro_postfix \
-		-t sane-kds-s2000w-net-builder-$distro_postfix
+		|| return $?
 }
 
 run_builder_container()
@@ -26,8 +28,8 @@ run_builder_container()
 	podman run \
 		--rm \
 		-v .:/src \
-		-e EXTRA_VERSION=$distro_postfix \
-		sane-kds-s2000w-net-builder-$distro_postfix
+		sane-kds-s2000w-net-builder-$distro_postfix \
+		|| return $?
 }
 
 main()
@@ -38,7 +40,7 @@ main()
 
 	for distro in $distros; do
 		local distro_postfix=${distro/:/-}
-		create_containerfile "$distro" || return $?
+		create_containerfile "$distro" "$distro_postfix" || return $?
 		build_container_image "$distro_postfix" || return $?
 		run_builder_container "$distro_postfix" || return $?
 	done