From: Bastian Dehn Date: Mon, 27 Apr 2026 17:52:39 +0000 (+0200) Subject: change long parameters X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=eda90d2d2aa3714e2206c4d4bf0e70c20e4ddc24;p=feierabend.git change long parameters --- diff --git a/builder/builder b/builder/builder index bc86741..5260e73 100755 --- 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 bd779b6..b61bc82 100644 --- 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()