From 06721a17b322a5cc5f12a339abe6919a0f091ef0 Mon Sep 17 00:00:00 2001
From: Tobias Waldekranz <tobias@waldekranz.com>
Date: Fri, 22 Nov 2024 15:00:40 +0100
Subject: [PATCH] board/common: Address review feedback on hw-wait

- Fix various shellcheck warnings
- Use idiomatic formatting of multiline finit stanzas
---
 .../rootfs/usr/lib/finit/system/20-hw-wait.conf      |  8 ++++----
 board/common/rootfs/usr/libexec/infix/hw-wait        | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/board/common/rootfs/usr/lib/finit/system/20-hw-wait.conf b/board/common/rootfs/usr/lib/finit/system/20-hw-wait.conf
index 9547759c..5d6bc0c1 100644
--- a/board/common/rootfs/usr/lib/finit/system/20-hw-wait.conf
+++ b/board/common/rootfs/usr/lib/finit/system/20-hw-wait.conf
@@ -1,9 +1,9 @@
 # Extend finit's default udevadm settle synchronization for situations
 # where device are very slow to probe (see #685)
-run nowarn if:udevd cgroup.init [S] <service/udevd/ready> log \
-	/usr/libexec/infix/hw-wait -- Probing hardware
+run nowarn if:udevd cgroup.init <service/udevd/ready> log \
+	[S] /usr/libexec/infix/hw-wait -- Probing hardware
 
 # Now that everything should be probed, do a final pass over the
 # uevent queue before starting syslogd and everything else
-run nowarn if:udevd cgroup.init :post [S] <service/udevd/ready> log \
-	udevadm settle -t 30 --
+run nowarn if:udevd cgroup.init :post <service/udevd/ready> log \
+	[S] udevadm settle -t 30 --
diff --git a/board/common/rootfs/usr/libexec/infix/hw-wait b/board/common/rootfs/usr/libexec/infix/hw-wait
index 97660ede..d06338fe 100755
--- a/board/common/rootfs/usr/libexec/infix/hw-wait
+++ b/board/common/rootfs/usr/libexec/infix/hw-wait
@@ -6,15 +6,15 @@ ident=$(basename "$0")
 
 report()
 {
-    if [ -r /tmp/$ident ]; then
-	logger -k -p user.$1 -t "$ident" "Waited for slow devices:"
-	sort /tmp/$ident | uniq -c | logger -k -p user.$1 -t "$ident"
+    if [ -r "/tmp/$ident" ]; then
+	logger -k -p "user.$1" -t "$ident" "Waited for slow devices:"
+	sort "/tmp/$ident" | uniq -c | logger -k -p "user.$1" -t "$ident"
     fi
 
-    rm -f /tmp/$ident
+    rm -f "/tmp/$ident"
 }
 
-for i in $(seq 50); do
+for _ in $(seq 50); do
     again=
 
     for dl in /sys/class/devlink/*; do
@@ -22,7 +22,7 @@ for i in $(seq 50); do
 
     	status=$(cat "$dl/status")
 	if [ "$status" = "consumer probing" ]; then
-	    basename $(readlink "$dl/consumer") >>/tmp/$ident
+	    basename "$(readlink "$dl/consumer")" >>"/tmp/$ident"
 	    again=yes
 	fi