From 10dbfdec2df187fe29ec3613e1bdc04e14322565 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Sun, 6 Nov 2022 19:19:46 +0100
Subject: [PATCH] package/ssdp-responder: fix warnings from check-package and
shellcheck
Summary of changes:
- Fix use of $DAEMON, found by check-package
- Expects DAEMON to be name of daemon controlled by script, this
causes ripple efects in rest of script
- Recommend `chmod a-x`, .mk file installs with `-m 0755`
- Fix shellcheck warnings:
- Use "$VAR" in case of spaces in filenames
- recommend not using $? in if stmt, should use `if start-stop ...`
- mismatch in indentation in case-esac
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
package/ssdp-responder/S50ssdpd | 47 +++++++++++++++++++--------------
1 file changed, 27 insertions(+), 20 deletions(-)
mode change 100755 => 100644 package/ssdp-responder/S50ssdpd
diff --git a/package/ssdp-responder/S50ssdpd b/package/ssdp-responder/S50ssdpd
old mode 100755
new mode 100644
index e33992be91..8654de4f26
--- a/package/ssdp-responder/S50ssdpd
+++ b/package/ssdp-responder/S50ssdpd
@@ -1,25 +1,32 @@
#!/bin/sh
-NAME=ssdpd
-PIDFILE=/var/run/$NAME.pid
-DAEMON=/usr/sbin/$NAME
-CFGFILE=/etc/default/$NAME
+DAEMON=ssdpd
+PIDFILE=/var/run/$DAEMON.pid
+CFGFILE=/etc/default/$DAEMON
DAEMON_ARGS=""
# Read configuration variable file if it is present
-[ -f $CFGFILE ] && . $CFGFILE
+# shellcheck source=/dev/null
+[ -r "$CFGFILE" ] && . "$CFGFILE"
+# shellcheck disable=SC2086
start() {
- printf 'Starting %s: ' "$NAME"
- start-stop-daemon -S -q -p $PIDFILE -x $DAEMON -- $DAEMON_ARGS
- [ $? = 0 ] && echo "OK" || echo "FAIL"
+ printf 'Starting %s: ' "$DAEMON"
+ if start-stop-daemon -S -q -p "$PIDFILE" -x "$DAEMON" -- $DAEMON_ARGS; then
+ echo "OK"
+ else
+ echo "FAIL"
+ fi
}
stop() {
- printf 'Stopping %s: ' "$NAME"
- start-stop-daemon -K -q -p $PIDFILE -x $DAEMON
- [ $? = 0 ] && echo "OK" || echo "FAIL"
+ printf 'Stopping %s: ' "$DAEMON"
+ if start-stop-daemon -K -q -p "$PIDFILE" -x "$DAEMON"; then
+ echo "OK"
+ else
+ echo "FAIL"
+ fi
}
restart() {
@@ -28,15 +35,15 @@ restart() {
}
case "$1" in
- start|stop|restart)
- "$1"
- ;;
- reload)
- restart
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|reload}"
- exit 1
+ start|stop|restart)
+ "$1"
+ ;;
+ reload)
+ restart
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
esac
exit $?