===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.104
retrieving revision 1.109
diff -u -r1.104 -r1.109
--- openbsd/fw_update/fw_install.sh	2021/12/22 04:56:05	1.104
+++ openbsd/fw_update/fw_install.sh	2021/12/23 19:32:59	1.109
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.104 2021/12/22 04:56:05 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.109 2021/12/23 19:32:59 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -151,26 +151,41 @@
 }
 
 installed_firmware() {
-	set +o noglob
-	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
-		[ -e "$fw/+CONTENTS" ] || continue
+	local _pattern="$1" _firmware
+	set -A _firmware -- $(
+	    set +o noglob
+	    grep -Fxl '@option firmware' \
+		"${DESTDIR}/var/db/pkg/"$_pattern"/+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 () {
-	local _f="${1##*/}"
-	local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"
+	local _f="${1##*/}" _pkgname
+	local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
 	local flags=-VM
 	"$VERBOSE" && flags=-vm
 	ftp -D "Install" "$flags" -o- "file:${1}" |
-		tar -s ",^\+,${_pkgdir}/+," \
+		tar -s ",^\+,${_tmpdir}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
 
+	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
+	if [ ! "$_pkgname" ]; then
+		echo "Failed to extract name from $1, partial install" 2>&1
+		rm -rf "$_tmpdir"
+		return 1
+	fi
+
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_pkgdir}/+CONTENTS" <<EOL
+	ed -s "${_tmpdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -178,6 +193,9 @@
 .
 w
 EOL
+
+	chmod 755 "$_tmpdir"
+	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
 }
 
 delete_firmware() {
@@ -187,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
@@ -216,7 +240,7 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-D | -L] [-v] [driver | file ...]"
 	exit 2
 }
 
@@ -285,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