fix builder shellcheck issues

diff --git a/builder/builder b/builder/builder
index c8c338c39b1ee979e8476bfa2f477c29ac112aa3..387e31d386bd0014e9ec72100cd3d2e7e45750a0 100755 (executable)
--- a/builder/builder
+++ b/builder/builder
@@ -5,9 +5,8 @@ create_containerfile()
        local distro="$1"
        local distro_postfix="$2"
 
-       cat builder/Containerfile.template \
-               | sed "s/\$distro/$distro/" \
-               > build/Containerfile-$distro_postfix \
+       sed "s/\$distro/$distro/" builder/Containerfile.template \
+               > "build/Containerfile-$distro_postfix" \
                || return $?
 }
 
@@ -16,8 +15,8 @@ build_container_image()
        local distro_postfix="$1"
 
        podman build \
-               --tag sane-kds-s2000w-net-builder:$distro_postfix \
-               --file build/Containerfile-$distro_postfix \
+               --tag "sane-kds-s2000w-net-builder:$distro_postfix" \
+               --file "build/Containerfile-$distro_postfix" \
                || return $?
 }
 
@@ -29,7 +28,7 @@ run_builder_container()
                --tty \
                --rm \
                --volume .:/src \
-               sane-kds-s2000w-net-builder:$distro_postfix \
+               "sane-kds-s2000w-net-builder:$distro_postfix" \
                || return $?
 }
 

diff --git a/builder/run b/builder/run
index eb63e9c760bf6c25da854074ed04b3b3efda2a82..0305c45bc15b21c78b175cb4dce2505bd5785662 100644 (file)
--- a/builder/run
+++ b/builder/run
@@ -2,25 +2,28 @@
 
 get_source_date()
 {
+       export SOURCE_DATE_EPOCH=
        umask 0022 || return $?
        cd /src || return $?
-       export SOURCE_DATE_EPOCH=$(git log --max-count=1 --pretty="%ct")
+       SOURCE_DATE_EPOCH=$(git log --max-count=1 --pretty="%ct")
 }
 
 create_package_checksum()
 {
-       local package=$(find . -maxdepth 1 -name '*.deb' )
-       lintian --fail-on error,warning,pedantic $package || return $?
-       sha256sum *.deb > $package.sha256 || return $?
-       cat $package.sha256 || return $?
+       local package=
+       package=$(find . -maxdepth 1 -name '*.deb' )
+       lintian --fail-on error,warning,pedantic "$package" || return $?
+       sha256sum ./*.deb > "$package.sha256" || return $?
+       cat "$package.sha256" || return $?
 }
 
 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 || return $?
+       local package=
+       package=$(find . -maxdepth 1 -name '*.deb')
+       cp "/src/build/$package.sha256" . || return $?
+       cat "$package.sha256" || return $?
+       sha256sum -c "$package.sha256" || return $?
 }
 
 ################################################################################
@@ -34,7 +37,7 @@ run_tests()
        cmake -DCMAKE_BUILD_TYPE=Debug \
                -DIMAGEMAGICK=OFF \
                -DRUN_TESTS=ON /src || return $?
-       make --jobs=$(nproc) || return $?
+       make --jobs="$(nproc)" || return $?
 }
 
 build_package()
@@ -44,7 +47,7 @@ build_package()
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DIMAGEMAGICK=OFF \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" /src || return $?
-       make --jobs=$(nproc) package || return $?
+       make --jobs="$(nproc)" package || return $?
 }
 
 copy_package()
@@ -61,7 +64,7 @@ build_reproducible_package()
        cmake -DCMAKE_BUILD_TYPE=Release \
                -DIMAGEMAGICK=OFF \
                -DEXTRA_VERSION="-$ID-$VERSION_CODENAME" /src || return $?
-       make --jobs=$(nproc) package || return $?
+       make --jobs="$(nproc)" package || return $?
 }
 
 ################################################################################
@@ -75,7 +78,7 @@ run_imagemagick_tests()
        cmake -DCMAKE_BUILD_TYPE=Debug \
                -DIMAGEMAGICK=ON \
                -DRUN_TESTS=ON /src || return $?
-       make --jobs=$(nproc) || return $?
+       make --jobs="$(nproc)" || return $?
 }
 
 build_imagemagick_package()
@@ -86,7 +89,7 @@ build_imagemagick_package()
                -DIMAGEMAGICK=ON \
                -DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" /src \
                || return $?
-       make --jobs=$(nproc) package || return $?
+       make --jobs="$(nproc)" package || return $?
 }
 
 copy_imagemagick_package()
@@ -104,7 +107,7 @@ build_imagemagick_reproducible_package()
                -DIMAGEMAGICK=ON \
                -DEXTRA_VERSION="-imagemagick-$ID-$VERSION_CODENAME" /src \
                || return $?
-       make --jobs=$(nproc) package || return $?
+       make --jobs="$(nproc)" package || return $?
 }
 
 ################################################################################