===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.106
retrieving revision 1.110
diff -u -r1.106 -r1.110
--- openbsd/fw_update/fw_install.sh	2021/12/23 01:25:29	1.106
+++ openbsd/fw_update/fw_install.sh	2021/12/23 19:48:55	1.110
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.106 2021/12/23 01:25:29 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.110 2021/12/23 19:48:55 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -151,12 +151,20 @@
 }
 
 installed_firmware() {
-	set +o noglob
-	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
-		[ -e "$fw/+CONTENTS" ] || continue
+	local _pre="$1" _match="$2" _post="$3" _firmware
+	set -A _firmware -- $(
+	    set +o noglob
+	    grep -Fxl '@option firmware' \
+		"${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \
+		2>/dev/null || true
+	    set -o noglob
+	)
+
+	[ "${_firmware[*]:-}" ] || return 0
+	for fw in "${_firmware[@]}"; do
+		fw="${fw%/+CONTENTS}"
 		echo "${fw##*/}"
 	done
-	set -o noglob
 }
 
 add_firmware () {
@@ -197,6 +205,12 @@
 	"$VERBOSE" && echo "Uninstalling $_pkg"
 	_cwd="${_pkgdir}/$_pkg"
 
+	if [ ! -e "$_cwd/+CONTENTS" ] ||
+	    ! grep -Fxq '@option firmware' "$_cwd/+CONTENTS"; then
+		echo "${0##*/}: $_pkg does not appear to be firmware" >&2
+		return 2
+	fi
+
 	set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"
 
 	while read -r c g; do
@@ -226,7 +240,7 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-v] [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-D | -L] [-v] [driver | file ...]"
 	exit 2
 }
 
@@ -295,7 +309,7 @@
 		exit 2
 	fi
 
-	set -A installed -- $( installed_firmware "$d" )
+	set -A installed -- $( installed_firmware '' "$d-firmware-" '*' )
 
 	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do