===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.55
retrieving revision 1.57
diff -u -r1.55 -r1.57
--- openbsd/fw_update/fw_install.sh	2021/12/08 03:37:44	1.55
+++ openbsd/fw_update/fw_install.sh	2021/12/08 03:45:05	1.57
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.55 2021/12/08 03:37:44 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.57 2021/12/08 03:45:05 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -116,9 +116,18 @@
 }
 
 firmware_filename() {
-	sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d'
+	local _f
+	_f="$( sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d' )"
+	! [ "$_f" ] && echo "Unable to find firmware for $1" >&2 && return 1
+	echo "$_f"
 }
 
+firmware_devicename() {
+	local _d="${1##*/}"
+	_d="${_d%-firmware-*}"
+	echo "$_d"
+}
+
 installed_firmware() {
 	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
 		[ -e "$fw" ] || continue
@@ -195,7 +204,7 @@
     echo "Signature check of SHA256.sig failed" >&2 && exit 1
 
 for d in "${devices[@]}"; do
-	f=$( firmware_filename "$d" )
+	f=$( firmware_filename "$d" || true )
 	[ "$f" ] || continue
 	set -A installed -- $( installed_firmware "$d" )