===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- openbsd/fw_update/fw_install.sh	2021/12/25 02:44:51	1.128
+++ openbsd/fw_update/fw_install.sh	2021/12/25 04:04:41	1.129
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.128 2021/12/25 02:44:51 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.129 2021/12/25 04:04:41 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -41,10 +41,12 @@
 LOCALSRC=
 
 unset FTPPID
+unset FWPKGTMP
 REMOVE_LOCALSRC=false
 cleanup() {
 	set +o errexit # ignore errors from killing ftp
 	[ "${FTPPID:-}" ] && kill -TERM -"$FTPPID" 2>/dev/null
+	[ "${FWPKGTMP:-}" ] && rm -rf "$FWPKGTMP"
 	"$REMOVE_LOCALSRC" && rm -rf "$LOCALSRC"
 }
 trap cleanup EXIT
@@ -195,23 +197,24 @@
 
 add_firmware () {
 	local _f="${1##*/}" _pkgname
-	local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
+	FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
 	local flags=-VM
 	"$VERBOSE" && flags=-vm
 	ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" |
-		tar -s ",^\+,${_tmpdir}/+," \
+		tar -s ",^\+,${FWPKGTMP}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
 
-	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
+	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${FWPKGTMP}/+CONTENTS" )"
 	if [ ! "$_pkgname" ]; then
 		echo "Failed to extract name from $1, partial install" 2>&1
-		rm -rf "$_tmpdir"
+		rm -rf "$FWPKGTMP"
+		unset FWPKGTMP
 		return 1
 	fi
 
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_tmpdir}/+CONTENTS" <<EOL
+	ed -s "${FWPKGTMP}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -220,8 +223,9 @@
 w
 EOL
 
-	chmod 755 "$_tmpdir"
-	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	chmod 755 "$FWPKGTMP"
+	mv "$FWPKGTMP" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	unset FWPKGTMP
 }
 
 delete_firmware() {