===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.15
retrieving revision 1.19
diff -u -r1.15 -r1.19
--- openbsd/fw_update/fw_install.sh	2021/10/17 23:56:24	1.15
+++ openbsd/fw_update/fw_install.sh	2021/10/21 02:02:52	1.19
@@ -6,13 +6,6 @@
 	sed -n "$1" /var/run/dmesg.boot
 }
 
-installed_firmware() {
-	for fw in ${PKGDIR}/$1-firmware*; do
-		[ -e "$fw" ] || continue
-		echo ${fw##*/}
-	done
-}
-
 # tmpdir, do_as, unpriv, and unpriv2 are from install.sub
 
 # Create a temporary directory based on the supplied directory name prefix.
@@ -132,6 +125,11 @@
 	[[ ! -d $_tmpsrc ]] &&
 		_issue="Cannot create prefetch area" && fail
 
+	# Cleanup from previous runs.
+	rm -f $_cfile $_cfile.sig
+
+    _t=Get/Verify
+
 	! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&
 	    _issue="Cannot fetch SHA256.sig" && fail
 
@@ -142,7 +140,12 @@
 
 	for _d in $_drivers; do
 		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
-		_installed=$( installed_firmware "$_d" )
+		_installed=$(
+	        for fw in "${PKGDIR}/$_d-firmware"*; do
+		        [ -e "$fw" ] || continue
+		        echo ${fw##*/}
+	        done
+        )
 
 		for _i in $_installed; do
 			if [ "$_f" = "$_i.tgz" ]; then
@@ -153,7 +156,6 @@
 
 		rm -f /tmp/h /tmp/fail
 
-		_t=Get/Verify
 		# Fetch firmware file and create a checksum by piping through
 		# sha256. Create a flag file in case ftp failed. Firmware
 		# from net is written to the prefetch area.
@@ -179,9 +181,9 @@
 		fi
 
 		# TODO: Check hash for files before deleting
-		if [ "$installed" ] && [ -e "${PKGDIR}/$installed/+CONTENTS" ]; then
-			echo "Uninstalling $installed"
-			cwd=${PKGDIR}/$installed
+		if [ "$_installed" ] && [ -e "${PKGDIR}/$_installed/+CONTENTS" ]; then
+			echo "Uninstalling $_installed"
+			cwd=${PKGDIR}/$_installed
 
 			set -A _remove -- "${cwd}/+CONTENTS" "${cwd}"
 
@@ -194,7 +196,7 @@
 				*)  set -A _remove -- "$cwd/$c" "${_remove[@]}"
 				  ;;
 				esac
-			done < "${PKGDIR}/$installed/+CONTENTS"
+			done < "${PKGDIR}/$_installed/+CONTENTS"
 
 			for _r in "${_remove[@]}" ; do
 				if [ -d "$_r" ]; then