===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- openbsd/fw_update/fw_install.sh	2021/12/22 17:53:53	1.105
+++ openbsd/fw_update/fw_install.sh	2021/12/23 01:25:29	1.106
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.105 2021/12/22 17:53:53 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.106 2021/12/23 01:25:29 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -160,17 +160,24 @@
 }
 
 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 +185,9 @@
 .
 w
 EOL
+
+	chmod 755 "$_tmpdir"
+	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
 }
 
 delete_firmware() {