===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.14
retrieving revision 1.16
diff -u -r1.14 -r1.16
--- openbsd/fw_update/fw_install.sh	2021/10/17 23:25:14	1.14
+++ openbsd/fw_update/fw_install.sh	2021/10/18 00:18:02	1.16
@@ -100,19 +100,19 @@
 PATTERNS="file:${0%/*}/firmware_patterns"
 
 fw_update() {
-	local _tmpsrc _f _remove _r
+	local _tmpsrc _f _r _remove _i _installed
 	local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false
-	local _drivers=$(
+	local _d _drivers=$(
 		last=''
 		ftp -D "Detecting" -Vmo- $PATTERNS |
-		while read d m; do
+		while read _d _m; do
 			grep=grep
-			[ "$last" = "$d" ] && continue
-			[ "$m" ] || m="^$d[0-9][0-9]* at "
-			[ "$m" = "${m#^}" ] && grep=fgrep
-			$grep -q "$m" /var/run/dmesg.boot || continue
-			echo $d
-			last=$d
+			[ "$last" = "$_d" ] && continue
+			[ "$_m" ] || _m="^$_d[0-9][0-9]* at "
+			[ "$_m" = "${_m#^}" ] && grep=fgrep
+			$grep -q "$_m" /var/run/dmesg.boot || continue
+			echo $_d
+			last=$_d
 		done
 	)
 
@@ -132,6 +132,9 @@
 	[[ ! -d $_tmpsrc ]] &&
 		_issue="Cannot create prefetch area" && fail
 
+	# Cleanup from previous runs.
+	rm -f $_cfile $_cfile.sig
+
 	! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&
 	    _issue="Cannot fetch SHA256.sig" && fail
 
@@ -140,13 +143,13 @@
 	    signify -Vep $FWPUB_KEY -x "$_cfile.sig" -m "$_cfile" &&
 	    _issue="Signature check of SHA256.sig failed" && fail
 
-	for d in $_drivers; do
-		_f=$( sed -n "s/.*(\($d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
-		installed=$( installed_firmware "$d" )
+	for _d in $_drivers; do
+		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
+		_installed=$( installed_firmware "$_d" )
 
-		for i in $installed; do
-			if [ "$_f" = "$i.tgz" ]; then
-				echo "Firmware for $d already installed ($installed)"
+		for _i in $_installed; do
+			if [ "$_f" = "$_i.tgz" ]; then
+				echo "Firmware for $_d already installed ($_installed)"
 				continue 2
 			fi
 		done