From d2265afbc7c65a8bca78e1f5332eee92eb35eb09 Mon Sep 17 00:00:00 2001
From: Bastian Dehn <hhaalo@arcor.de>
Date: Mon, 27 Apr 2026 19:49:29 +0200
Subject: [PATCH] change builder long parameters

---
 builder/builder |  9 +++++----
 builder/run     | 16 ++++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/builder/builder b/builder/builder
index 08421f4..023bdef 100755
--- a/builder/builder
+++ b/builder/builder
@@ -16,8 +16,8 @@ build_container_image()
 	local distro_postfix="$1"
 
 	podman build \
-		-t sane-kds-s2000w-net-builder:$distro_postfix \
-		-f build/Containerfile-$distro_postfix \
+		--tag sane-kds-s2000w-net-builder:$distro_postfix \
+		--file build/Containerfile-$distro_postfix \
 		|| return $?
 }
 
@@ -26,8 +26,9 @@ run_builder_container()
 	local distro_postfix="$1"
 
 	podman run \
+		--tty \
 		--rm \
-		-v .:/src \
+		--volume .:/src \
 		sane-kds-s2000w-net-builder:$distro_postfix \
 		|| return $?
 }
@@ -35,7 +36,7 @@ run_builder_container()
 main()
 {
 	local distros=${DISTROS:="debian:oldstable-slim debian:stable-slim debian:testing-slim ubuntu:latest ubuntu:rolling"}
-	mkdir -p build
+	mkdir --parents build
 	cp builder/run build/run
 	chmod 755 build/run
 
diff --git a/builder/run b/builder/run
index 3698e32..4ae6cb9 100644
--- a/builder/run
+++ b/builder/run
@@ -2,33 +2,33 @@
 
 run_tests()
 {
-	mkdir -p /app/tests && cd /app/tests
+	mkdir --parents /app/tests && cd /app/tests
 	cmake -DCMAKE_BUILD_TYPE=Debug \
 		-DIMAGEMAGICK=OFF \
 		-DRUN_TESTS=ON /src || return $?
-	make -j$(nproc) || return $?
+	make --jobs=$(nproc) || return $?
 
-	mkdir -p /app/imagemagick-tests && cd /app/imagemagick-tests
+	mkdir --parents /app/imagemagick-tests && cd /app/imagemagick-tests
 	cmake -DCMAKE_BUILD_TYPE=Debug \
 		-DIMAGEMAGICK=ON \
 		-DRUN_TESTS=ON /src || return $?
-	make -j$(nproc) || return $?
+	make --jobs=$(nproc) || return $?
 }
 
 build_package()
 {
 
-	mkdir -p /app/build && cd /app/build
+	mkdir --parents /app/build && cd /app/build
 	cmake -DCMAKE_BUILD_TYPE=Release \
 		-DIMAGEMAGICK=OFF \
 		-DEXTRA_VERSION="-$ID-$VERSION_CODENAME" /src || return $?
-	make -j$(nproc) package || return $?
+	make --jobs=$(nproc) package || return $?
 
-	mkdir -p /app/imagemagick-build && cd /app/imagemagick-build
+	mkdir --parents /app/imagemagick-build && cd /app/imagemagick-build
 	cmake -DCMAKE_BUILD_TYPE=Release \
 		-DIMAGEMAGICK=ON \
 		-DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" /src || return $?
-	make -j$(nproc) package || return $?
+	make --jobs=$(nproc) package || return $?
 }
 
 copy_package()
-- 
2.47.3