===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- openbsd/fw_update/fw_install.sh	2021/12/23 19:32:59	1.109
+++ 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.109 2021/12/23 19:32:59 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,11 +151,11 @@
 }
 
 installed_firmware() {
-	local _pattern="$1" _firmware
+	local _pre="$1" _match="$2" _post="$3" _firmware
 	set -A _firmware -- $(
 	    set +o noglob
 	    grep -Fxl '@option firmware' \
-		"${DESTDIR}/var/db/pkg/"$_pattern"/+CONTENTS" \
+		"${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \
 		2>/dev/null || true
 	    set -o noglob
 	)
@@ -309,7 +309,7 @@
 		exit 2
 	fi
 
-	set -A installed -- $( installed_firmware "$d-firmware-*" )
+	set -A installed -- $( installed_firmware '' "$d-firmware-" '*' )
 
 	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do