===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.14
retrieving revision 1.20
diff -u -r1.14 -r1.20
--- openbsd/fw_update/fw_install.sh	2021/10/17 23:25:14	1.14
+++ openbsd/fw_update/fw_install.sh	2021/10/21 02:17:27	1.20
@@ -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.
@@ -70,6 +63,7 @@
 	do_as _file "$@"
 }
 
+# "fail" needs to be replaced with the "ask_yn" loop like in the installer.
 _issue=
 fail() {
 	echo $_issue >&2
@@ -97,22 +91,23 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 PKGDIR=${DESTDIR}/var/db/pkg
-PATTERNS="file:${0%/*}/firmware_patterns"
+FWPATTERNS="file:${0%/*}/firmware_patterns"
 
+# TODO: support srclocal installation of firmware somehow
 fw_update() {
-	local _tmpsrc _f _remove _r
-	local _src=$FWURL _t=Get _cfile="/tmp/SHA256" _srclocal=false
-	local _drivers=$(
+	local _src=$FWURL _tmpsrc _t=Get _cfile="/tmp/SHA256" _srclocal=false
+	local _f _r _remove _i _installed
+	local _d _drivers=$(
 		last=''
-		ftp -D "Detecting" -Vmo- $PATTERNS |
-		while read d m; do
+		ftp -D "Detecting" -Vmo- $FWPATTERNS |
+		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 +127,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
 
@@ -140,20 +140,24 @@
 	    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=$(
+	        for fw in "${PKGDIR}/$_d-firmware"*; do
+		        [ -e "$fw" ] || continue
+		        echo ${fw##*/}
+	        done
+        )
 
-		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
 
 		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 +183,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,8 +198,10 @@
 				*)  set -A _remove -- "$cwd/$c" "${_remove[@]}"
 				  ;;
 				esac
-			done < "${PKGDIR}/$installed/+CONTENTS"
+			done < "${PKGDIR}/$_installed/+CONTENTS"
 
+            # We specifically rm -f here because not removing files/dirs
+            # is probably not worth failing over.
 			for _r in "${_remove[@]}" ; do
 				if [ -d "$_r" ]; then
 					# Try hard not to actually remove recursively
@@ -207,8 +213,7 @@
 			done
 		fi
 
-        # TODO: Add some details about the install to +CONTENTS like pkg_add
-        # TODO: Or, maybe we save the firmware someplace and make pkg_add reinstall
+        # TODO: Should we mark these so real fw_update can -Drepair?
 		echo "Installing $_f"
 		tar -zxphf "$_tmpsrc/$_f" -C "${DESTDIR}/etc" "firmware/*"
 		mkdir -p ${PKGDIR}/${_f%.tgz}/