From: Bastian Dehn <hhaalo@arcor.de>
Date: Sun, 28 Jun 2026 06:35:56 +0000 (+0200)
Subject: fix builder shellcheck issues
X-Git-Tag: 1.3.25^2~2
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=a3b75f79161cc6c371751b1cf5d556b9447ee569;p=feierabend.git

fix builder shellcheck issues
---

diff --git a/builder/builder b/builder/builder
index b31c04f..3c16736 100755
--- 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 feierabend-builder:$distro_postfix \
-		--file build/Containerfile-$distro_postfix \
+		--tag "feierabend-builder:$distro_postfix" \
+		--file "build/Containerfile-$distro_postfix" \
 		|| return $?
 }
 
@@ -29,9 +28,9 @@ run_build_container()
 		--tty \
 		--rm \
 		--volume .:/src \
-		--env SOLL_HOUR=$SOLL_HOUR \
-		--env SOLL_MINUTES=$SOLL_MINUTES \
-		feierabend-builder:$distro_postfix \
+		--env SOLL_HOUR="$SOLL_HOUR" \
+		--env SOLL_MINUTES="$SOLL_MINUTES" \
+		"feierabend-builder:$distro_postfix" \
 		|| return $?
 }
 
diff --git a/builder/run b/builder/run
index 857d2dc..83f7cf6 100644
--- a/builder/run
+++ b/builder/run
@@ -2,28 +2,31 @@
 
 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')
+	local package=
+	package=$(find . -maxdepth 1 -name '*.deb')
 	lintian --fail-on error,warning,pedantic \
 		--suppress-tags privacy-breach-generic \
-		$package \
+		"$package" \
 		|| return $?
-	sha256sum *.deb > $package.sha256 || return $?
-	cat $package.sha256 || 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 $?
 }
 
 run_tests()
@@ -31,7 +34,7 @@ run_tests()
 	mkdir --parents /app/tests || return $?
 	cd /app/tests || return $?
 	cmake -DCMAKE_BUILD_TYPE=Debug /src || return $?
-	make --jobs=$(nproc) || return $?
+	make --jobs="$(nproc)" || return $?
 }
 
 build_package()
@@ -45,7 +48,7 @@ build_package()
 		-DEXTRA_VERSION="-$ID-$VERSION_CODENAME" \
 		-DSOLL_HOUR="$soll_hour" \
 		-DSOLL_MINUTES="$soll_minutes" /src || return $?
-	make --jobs=$(nproc) package || return $?
+	make --jobs="$(nproc)" package || return $?
 }
 
 build_reproducible_package()
@@ -59,7 +62,7 @@ build_reproducible_package()
 		-DEXTRA_VERSION="-$ID-$VERSION_CODENAME" \
 		-DSOLL_HOUR="$soll_hour" \
 		-DSOLL_MINUTES="$soll_minutes" /src || return $?
-	make --jobs=$(nproc) package || return $?
+	make --jobs="$(nproc)" package || return $?
 }
 
 copy_package()