build: run shellcheck as part of test step

Especially unconfigured.sh is worth checking consistently.

Running shellcheck also does not really have any notable impact on build
time, so no downside there either.

Signed-off-by: Christoph Heiss <c.heiss@proxmox.com>
This commit is contained in:
Christoph Heiss 2024-03-15 11:23:45 +01:00 committed by Thomas Lamprecht
parent 3facbe51c6
commit 126379f614
4 changed files with 15 additions and 5 deletions

View File

@ -23,6 +23,13 @@ USR_BIN := proxmox-tui-installer
COMPILED_BINS := \
$(addprefix $(CARGO_COMPILEDIR)/,$(USR_BIN))
SHELL_SCRIPTS := \
fake-start-stop-daemon \
policy-disable-rc.d \
spice-vdagent.sh \
unconfigured.sh \
xinitrc
all:
$(BUILDDIR):
@ -36,18 +43,14 @@ $(BUILDDIR):
banner/ \
checktime \
country.pl \
fake-start-stop-daemon \
html/ \
interfaces \
policy-disable-rc.d \
proxinstall \
proxmox-low-level-installer \
proxmox-tui-installer/ \
proxmox-installer-common/ \
spice-vdagent.sh \
test/ \
unconfigured.sh \
xinitrc \
$(SHELL_SCRIPTS) \
$@.tmp
cp -a debian $@.tmp/
mv $@.tmp $@
@ -86,6 +89,7 @@ prepare-test-env: cd-info.test country.dat test.img
.PHONY: test
test: prepare-test-env
shellcheck $(SHELL_SCRIPTS)
$(MAKE) -C test check
$(CARGO) test --workspace $(CARGO_BUILD_ARGS)

1
debian/control vendored
View File

@ -15,6 +15,7 @@ Build-Depends: cargo:native,
libtest-mockmodule-perl,
perl,
rustc:native,
shellcheck,
Standards-Version: 4.5.1
Homepage: https://www.proxmox.com

View File

@ -99,6 +99,8 @@ real_reboot() {
exit 0 # shouldn't be reached, kernel will panic in that case
}
# reachable through the ERR trap
# shellcheck disable=SC2317
err_reboot() {
printf "\nInstallation aborted - unable to continue (type exit or CTRL-D to reboot)\n"
debugsh || true
@ -242,4 +244,5 @@ killall5 -15
real_reboot
# never reached
# shellcheck disable=SC2317
exit 0

View File

@ -1,3 +1,5 @@
#!/bin/sh
/usr/bin/xrdb -load /.Xdefaults
/usr/bin/X11/xsetroot -solid grey
openbox &