change build line length

diff --git a/builder/builder b/builder/builder
index 83a003c2c5e646bddc849fdd2f82360a91dc0924..1900df1145dfa2a246f101c57d2e9fb43cbd646b 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -35,7 +35,11 @@ run_builder_container()
 
 main()
 {
-       local distros=${DISTROS:="debian:oldstable-slim debian:stable-slim debian:testing-slim ubuntu:latest ubuntu:rolling"}
+       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

diff --git a/builder/run b/builder/run
index 18d7d0d8b079d3fc0130ad870e06af481ef44575..4eec3bfac3fe4974e37b48902075f7460d2a17f3 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -2,13 +2,14 @@
 
 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()
 {
-       local package=$(find . -maxdepth 1 -name '*.deb' )
+       local package=$(find . -maxdepth 1 -name '*.deb')
        lintian --fail-on error,warning,pedantic $package || return $?
        sha256sum *.deb > $package.sha256 || return $?
        cat $package.sha256 || return $?
@@ -19,19 +20,21 @@ 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 $?
 }
 
 run_tests()
 {
-       mkdir --parents /app/tests && cd /app/tests
+       mkdir --parents /app/tests || return $?
+       cd /app/tests || return $?
        cmake -DCMAKE_BUILD_TYPE=Debug /src || return $?
        make --jobs=$(nproc) || return $?
 }
 
 build_package()
 {
-       mkdir --parents /app/build && cd /app/build
+       mkdir --parents /app/build || return $?
+       cd /app/build || return $?
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" /src || return $?
        make --jobs=$(nproc) package || return $?
@@ -39,14 +42,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 /src \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" || return $?
        make --jobs=$(nproc) package || return $?
@@ -54,7 +58,7 @@ build_reproducible_package()
 
 main()
 {
-       source /etc/os-release
+       source /etc/os-release || return $?
        get_source_date || return $?
 
        run_tests || return $?