fix line length in builder

diff --git a/builder/builder b/builder/builder
index 023bdeff94eaacb59b9e03ef3cafd201d4714952..c8c338c39b1ee979e8476bfa2f477c29ac112aa3 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -35,10 +35,14 @@ run_builder_container()
 
 main()
 {
-       local distros=${DISTROS:="debian:oldstable-slim debian:stable-slim debian:testing-slim ubuntu:latest ubuntu:rolling"}
-       mkdir --parents build
-       cp builder/run build/run
-       chmod 755 build/run
+       local distros=${DISTROS:="debian:oldstable-slim
+               debian:stable-slim
+               debian:testing-slim
+               ubuntu:latest
+               ubuntu:rolling"}
+       mkdir --parents build || return $?
+       cp builder/run build/run || return $?
+       chmod 755 build/run || return $?
 
        for distro in $distros; do
                local distro_postfix=${distro/:/-}

diff --git a/builder/run b/builder/run
index ef42f254afd1d74ba2222921fd6b25a59d69ca3e..eb63e9c760bf6c25da854074ed04b3b3efda2a82 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -2,8 +2,9 @@
 
 get_source_date()
 {
-       umask 0022
-       cd /src && export SOURCE_DATE_EPOCH=$(git log --max-count=1 --pretty="%ct")
+       umask 0022 || return $?
+       cd /src || return $?
+       export SOURCE_DATE_EPOCH=$(git log --max-count=1 --pretty="%ct")
 }
 
 create_package_checksum()
@@ -19,7 +20,7 @@ reproducible_package_checksum_check()
        local package=$(find . -maxdepth 1 -name '*.deb')
        cp /src/build/$package.sha256 . || return $?
        cat $package.sha256 || return $?
-       sha256sum -c $package.sha256
+       sha256sum -c $package.sha256 || return $?
 }
 
 ################################################################################
@@ -28,7 +29,8 @@ reproducible_package_checksum_check()
 
 run_tests()
 {
-       mkdir --parents /app/tests && cd /app/tests
+       mkdir --parents /app/tests || return $?
+       cd /app/tests || return $?
        cmake -DCMAKE_BUILD_TYPE=Debug \
                -DIMAGEMAGICK=OFF \
                -DRUN_TESTS=ON /src || return $?
@@ -37,7 +39,8 @@ run_tests()
 
 build_package()
 {
-       mkdir --parents /app/build && cd /app/build
+       mkdir --parents /app/build || return $?
+       cd /app/build || return $?
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DIMAGEMAGICK=OFF \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" /src || return $?
@@ -46,14 +49,15 @@ build_package()
 
 copy_package()
 {
-       mkdir --parents /src/build
+       mkdir --parents /src/build || return $?
        cp /app/build/*.deb /src/build/ || return $?
        cp /app/build/*.sha256 /src/build/ || return $?
 }
 
 build_reproducible_package()
 {
-       mkdir --parents /app/reproducible-build && cd /app/reproducible-build
+       mkdir --parents /app/reproducible-build || return $?
+       cd /app/reproducible-build || return $?
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DIMAGEMAGICK=OFF \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" /src || return $?
@@ -66,7 +70,8 @@ build_reproducible_package()
 
 run_imagemagick_tests()
 {
-       mkdir --parents /app/imagemagick-tests && cd /app/imagemagick-tests
+       mkdir --parents /app/imagemagick-tests || return $?
+       cd /app/imagemagick-tests || return $?
        cmake -DCMAKE_BUILD_TYPE=Debug \
                -DIMAGEMAGICK=ON \
                -DRUN_TESTS=ON /src || return $?
@@ -75,10 +80,12 @@ run_imagemagick_tests()
 
 build_imagemagick_package()
 {
-       mkdir --parents /app/imagemagick-build && cd /app/imagemagick-build
+       mkdir --parents /app/imagemagick-build || return $?
+       cd /app/imagemagick-build || return $?
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DIMAGEMAGICK=ON \
-               -DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" /src || return $?
+               -DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" /src \
+               || return $?
        make --jobs=$(nproc) package || return $?
 }
 
@@ -91,10 +98,12 @@ copy_imagemagick_package()
 
 build_imagemagick_reproducible_package()
 {
-       mkdir --parents /app/imagemagick-reproducible-build && cd /app/imagemagick-reproducible-build
+       mkdir --parents /app/imagemagick-reproducible-build || return $?
+       cd /app/imagemagick-reproducible-build || return $?
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DIMAGEMAGICK=ON \
-               -DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" /src || return $?
+               -DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" /src \
+               || return $?
        make --jobs=$(nproc) package || return $?
 }