change long parameters

diff --git a/builder/builder b/builder/builder
index bc867414bc2692c082b7be0767ce89cbaed4a591..5260e73a2334797fa964caa4381c3b68a909752b 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -16,8 +16,8 @@ build_container_image()
        local distro_postfix="$1"
 
        podman build \
-               -f build/Containerfile-$distro_postfix \
-               -t feierabend-builder:$distro_postfix \
+               --tag feierabend-builder:$distro_postfix \
+               --file build/Containerfile-$distro_postfix \
                || return $?
 }
 
@@ -26,10 +26,11 @@ run_build_container()
        local distro_postfix="$1"
 
        podman run \
+               --tty \
                --rm \
-               -v .:/src \
-               -e SOLL_HOUR=$SOLL_HOUR \
-               -e SOLL_MINUTES=$SOLL_MINUTES \
+               --volume .:/src \
+               --env SOLL_HOUR=$SOLL_HOUR \
+               --env SOLL_MINUTES=$SOLL_MINUTES \
                feierabend-builder:$distro_postfix \
                || return $?
 }
@@ -37,7 +38,7 @@ run_build_container()
 main()
 {
        local distros=${DISTROS:="debian:oldstable-slim debian:stable-slim debian:testing-slim ubuntu:jammy 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 bd779b6119726630e9ecc78a134432023c0aec03..b61bc827d9f54dfc08c8ddf4f2cebcc824db04d5 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -2,9 +2,9 @@
 
 run_tests()
 {
-       mkdir -p /app/tests && cd /app/tests
+       mkdir --parents /app/tests && cd /app/tests
        cmake -DCMAKE_BUILD_TYPE=Debug /src || return $?
-       make -j$(nproc) || return $?
+       make --jobs=$(nproc) || return $?
 }
 
 build_package()
@@ -12,12 +12,12 @@ build_package()
        local soll_hour=${SOLL_HOUR:="8"}
        local soll_minutes=${SOLL_MINUTES:="0"}
 
-       mkdir -p /app/build && cd /app/build
+       mkdir --parents /app/build && cd /app/build
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" \
                -DSOLL_HOUR="$soll_hour" \
                -DSOLL_MINUTES="$soll_minutes" /src || return $?
-       make -j$(nproc) package || return $?
+       make --jobs=$(nproc) package || return $?
 }
 
 copy_package()