===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.33
retrieving revision 1.41
diff -u -r1.33 -r1.41
--- openbsd/fw_update/fw_install.sh	2021/11/19 03:13:11	1.33
+++ openbsd/fw_update/fw_install.sh	2021/12/01 02:30:43	1.41
@@ -1,6 +1,21 @@
 #!/bin/ksh
+#	$OpenBSD: fw_install.sh,v 1.41 2021/12/01 02:30:43 afresh1 Exp $
 set -e
 
+# Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
 # Fake up some things from install.sub that we don't need to actually do
 prefetcharea_fs_list() {
 	echo "${DESTDIR}/tmp"
@@ -64,9 +79,8 @@
 }
 
 VNAME=${VNAME:-$(sysctl -n kern.osrelease)}
-VERSION=${VERSION:"${VNAME%.*}${VNAME#*.}"}
+VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"}
 FWDIR=${FWDIR:-$VNAME}
-MODE=${MODE:-install}
 
 # TODO: We need the firmware for the system we just installed
 #       not the one we booted from.  For example:
@@ -84,19 +98,17 @@
 
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
-FWPATTERNS="file:${0%/*}/firmware_patterns"
+FWPATTERNS="${DESTDIR}/usr/share/misc/firmware_patterns"
 
 # TODO: support srclocal installation of firmware somehow
-fw_update() {
+fw_install() {
 	local _src=$1 _tmpfs_list _tmpfs _tmpsrc \
 		_t=Get _cfile="/tmp/SHA256" _pkgdir=${DESTDIR}/var/db/pkg \
 		_f _r _remove _i _installed
 	local _srclocal=false _unpriv=unpriv
 
-	echo "Let's $MODE firmware!"
 	local _d _drivers=$(
 		last=''
-		$_unpriv ftp -D "Detecting" -Vmo- $FWPATTERNS |
 		while read _d _m; do
 			grep=grep
 			[ "$last" = "$_d" ] && continue
@@ -105,7 +117,7 @@
 			$grep -q "$_m" /var/run/dmesg.boot || continue
 			echo $_d
 			last=$_d
-		done
+		done < $FWPATTERNS
 	)
 
 	if [ -z "$_drivers" ]; then
@@ -153,7 +165,7 @@
 	    echo "Signature check of SHA256.sig failed" >&2 && return 1
 
 	for _d in $_drivers; do
-		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
+		_f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" | sed '$!d' )
 		_installed=$(
 	        for fw in "${_pkgdir}/$_d-firmware"*; do
 		        [ -e "$fw" ] || continue
@@ -239,4 +251,4 @@
 	done
 }
 
-fw_update "$FWURL"
+fw_install "$FWURL"