From 998e8ccb1ffa77fcc5e70f361322682714db4f7c Mon Sep 17 00:00:00 2001 From: Heiko Thiery Date: Tue, 14 Jan 2025 08:29:50 +0100 Subject: [PATCH] package/netopeer2: fix shellcheck warnings The init script S52netopeer2 has to be renamed to S52netopeer2-server to match the daemon name. The step to install the init script now uses the NETOPEER2_PKGDIR variable to reference the directory instead of explicitly using the "package/netopeer2/" path. The init script now is removed from the .checkpackageignore file. Signed-off-by: Heiko Thiery Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - package/netopeer2/{S52netopeer2 => S52netopeer2-server} | 2 +- package/netopeer2/netopeer2.mk | 4 ++-- 3 files changed, 3 insertions(+), 4 deletions(-) rename package/netopeer2/{S52netopeer2 => S52netopeer2-server} (92%) diff --git a/.checkpackageignore b/.checkpackageignore index 68ad366d79..7ebfdd0499 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -861,7 +861,6 @@ package/neard/S53neard Shellcheck lib_sysv.Indent lib_sysv.Variables package/neardal/0001-lib-neardal.h-fix-build-with-gcc-10.patch lib_patch.Upstream package/netatalk/S50netatalk lib_sysv.EmptyLastLine lib_sysv.Indent lib_sysv.Variables package/netcat/0001-signed-bit-counting.patch lib_patch.Sob lib_patch.Upstream -package/netopeer2/S52netopeer2 Shellcheck lib_sysv.Variables package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch lib_patch.Upstream package/netplug/0001-makefile-flags.patch lib_patch.Sob lib_patch.Upstream package/netplug/0002-add-missing-time-include.patch lib_patch.Upstream diff --git a/package/netopeer2/S52netopeer2 b/package/netopeer2/S52netopeer2-server similarity index 92% rename from package/netopeer2/S52netopeer2 rename to package/netopeer2/S52netopeer2-server index cadd6b9feb..3fd993b578 100644 --- a/package/netopeer2/S52netopeer2 +++ b/package/netopeer2/S52netopeer2-server @@ -7,7 +7,7 @@ NETOPEER2_SERVER_ARGS="" start() { printf 'Starting %s: ' "$DAEMON" - + # shellcheck disable=SC2086 # we need the word splitting start-stop-daemon -S -q -p $PIDFILE -x "/usr/sbin/$DAEMON" \ -- $NETOPEER2_SERVER_ARGS status=$? diff --git a/package/netopeer2/netopeer2.mk b/package/netopeer2/netopeer2.mk index 47fcd31acd..4853e5d176 100644 --- a/package/netopeer2/netopeer2.mk +++ b/package/netopeer2/netopeer2.mk @@ -29,8 +29,8 @@ NETOPEER2_MAKE_ENV = \ SYSREPO_SHM_PREFIX=$(NETOPEER2_SYSREPO_SHM_PREFIX) define NETOPEER2_INSTALL_INIT_SYSV - $(INSTALL) -m 755 -D package/netopeer2/S52netopeer2 \ - $(TARGET_DIR)/etc/init.d/S52netopeer2 + $(INSTALL) -m 755 -D $(NETOPEER2_PKGDIR)/S52netopeer2-server \ + $(TARGET_DIR)/etc/init.d/S52netopeer2-server endef # The host sysrepo used to install the netopeer2 modules will leave