===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.89
retrieving revision 1.91
diff -u -r1.89 -r1.91
--- openbsd/fw_update/fw_install.sh	2021/12/19 04:05:25	1.89
+++ openbsd/fw_update/fw_install.sh	2021/12/19 20:04:42	1.91
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.89 2021/12/19 04:05:25 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.91 2021/12/19 20:04:42 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -114,7 +114,7 @@
 }
 
 devices_needing_firmware() {
-	local _d _m _line _dmesgtail _last=''
+	local _d _m _line _dmesgtail _last='' _nl=$( echo )
 
 	# When we're not in the installer, the dmesg.boot can
 	# contain multiple boots, so only look in the last one
@@ -124,12 +124,9 @@
 	grep -v '^[[:space:]]*#' "$FWPATTERNS" |
 	    while read -r _d _m; do
 		[ "$_d" = "$_last" ] && continue
-		[ "$_m" ] || _m="^${_d}[0-9] at "
+		[ "$_m" ]             || _m="${_nl}${_d}[0-9] at "
+		[ "$_m" = "${_m#^}" ] || _m="${_nl}${_m#^}"
 
-		if [ "$_m" != "${_m#^}" ]; then
-			_m="$( echo -n "\n${_m#^}" )"
-		fi
-
 		if [[ $_dmesgtail = *$_m* ]]; then
 			echo "$_d"
 			_last="$_d"
@@ -244,13 +241,13 @@
 
 set -A devices -- "$@"
 
-[ "${devices[*]:-}" ] ||
-    set -A devices -- $( devices_needing_firmware )
-
 if [ ! "${devices[*]:-}" ]; then
-	echo "No devices found which need firmware files to be downloaded."
-	exit
+	echo -n "Detecting firmware ..."
+	set -A devices -- $( devices_needing_firmware )
+	[ "${devices[*]:-}" ] && echo " found." || echo " done."
 fi
+
+[ "${devices[*]:-}" ] || exit
 
 if "$DOWNLOAD"; then
 	fetch "$CFILE"