===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.51
retrieving revision 1.59
diff -u -r1.51 -r1.59
--- openbsd/fw_update/fw_install.sh	2021/12/07 02:42:01	1.51
+++ openbsd/fw_update/fw_install.sh	2021/12/09 02:08:03	1.59
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.51 2021/12/07 02:42:01 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.59 2021/12/09 02:08:03 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -25,7 +25,8 @@
 VERSION=${VERSION:-"${VNAME%.*}${VNAME#*.}"}
 
 HTTP_FWDIR="$VNAME"
-VTYPE=$( sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" /var/run/dmesg.boot | sed '$!d' )
+VTYPE=$( sed -n "/^OpenBSD $VNAME\([^ ]*\).*$/s//\1/p" \
+    /var/run/dmesg.boot | sed '$!d' )
 [[ $VTYPE == -!(stable) ]] && HTTP_FWDIR=snapshots
 
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
@@ -47,6 +48,16 @@
 	echo "$_dir"
 }
 
+realpath () {
+	if [ -x /usr/bin/realpath ]; then
+		/usr/bin/realpath "$1"
+	elif [ "$1" = "${1%/*}" ]; then
+		echo "${PWD}/$1"
+	else
+		echo "$( cd "${1%/*}" && pwd )/${1##*/}"
+	fi
+}
+
 fetch() {
 	local _file=$1 _user=_file _exit
 
@@ -55,7 +66,7 @@
 
 	# If we're not in the installer, we have su(1)
 	# and doas(1) is unlikely to be configured.
-	if [ -x /usr/bin/sh ]; then
+	if [ -x /usr/bin/su ]; then
 		/usr/bin/su -s /bin/ksh "$_user" -c \
 		    "/usr/bin/ftp -D 'Get/Verify' -Vm \
 		        -o '$_file' '${FWURL}/${_file}'"
@@ -105,9 +116,18 @@
 }
 
 firmware_filename() {
-	sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d'
+	local _f
+	_f="$( sed -n "s/.*(\($1-firmware-.*\.tgz\)).*/\1/p" "$CFILE" | sed '$!d' )"
+	! [ "$_f" ] && echo "Unable to find firmware for $1" >&2 && return 1
+	echo "$_f"
 }
 
+firmware_devicename() {
+	local _d="${1##*/}"
+	_d="${_d%-firmware-*}"
+	echo "$_d"
+}
+
 installed_firmware() {
 	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
 		[ -e "$fw" ] || continue
@@ -116,7 +136,7 @@
 }
 
 add_firmware () {
-	local _f="$1" _pkgdir="${DESTDIR}/var/db/pkg"
+	local _f="${1##*/}" _pkgdir="${DESTDIR}/var/db/pkg"
 	ftp -D "Install" -Vmo- "file:${1}" |
 		tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \
 		-s ",^firmware,${DESTDIR}/etc/firmware," \
@@ -148,7 +168,7 @@
 		  ;;
 		@*) continue
 		  ;;
-		*)  set -A _remove -- "$_cwd/$c" "${_remove[@]}"
+		*) set -A _remove -- "$_cwd/$c" "${_remove[@]}"
 		  ;;
 		esac
 	done < "${_pkgdir}/${_pkg}/+CONTENTS"
@@ -166,13 +186,42 @@
 	done
 }
 
-set -A devices -- $( devices_needing_firmware )
+usage() {
+	echo "Usage: fw_install [ driver | file [ ... ] ]"
+	exit 2
+}
 
+while getopts '?' name
+do
+       case "$name" in
+       ?) usage 2 ;;
+       esac
+done
+shift $((OPTIND - 1))
+
+set -A devices -- "$@"
+
+[ "${devices[*]:-}" ] ||
+    set -A devices -- $( devices_needing_firmware )
+
 if [ ! "${devices:-}" ]; then
 	echo "No devices found which need firmware files to be downloaded."
 	exit
 fi
 
+# Have to find the full path to firmware files
+# so we can cd and still find them later.
+i=0
+while (( i < "${#devices[@]}" )); do
+	f="${devices[$i]}"
+	d=$( firmware_devicename "$f" )
+	[ "$f" = "$d" ] && f="$( echo "$f"-firmware-*.tgz | sed '$!d' )"
+	if [ -e "$f" ]; then
+		devices[$i]="$d:$( realpath "$f" )"
+	fi
+	i=$((i + 1))
+done
+
 TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )
 cd "$TMPDIR"
 
@@ -180,25 +229,33 @@
 chmod go+x .
 
 fetch "$CFILE"
-! signify -Vep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
+! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
     echo "Signature check of SHA256.sig failed" >&2 && exit 1
 
 for d in "${devices[@]}"; do
-	f=$( firmware_filename "$d" )
-	[ "$f" ] || continue
+	f="${d##*:}"
+	if [ "$f" = "$d" ]; then
+		f=$( firmware_filename "$d" || true )
+		[ "$f" ] || continue
+	else
+	    d="${d%:*}"
+	fi
+
 	set -A installed -- $( installed_firmware "$d" )
 
 	if [ "${installed:-}" ]; then
 		for i in "${installed[@]:-}"; do
-			if [ "$f" = "$i.tgz" ]; then
+			if [ "${f##*/}" = "$i.tgz" ]; then
 				echo "$i already installed"
 				continue 2
 			fi
 		done
 	fi
 
-	fetch  "$f" || continue
-	verify "$f" || continue
+	if [ ! -e "$f" ]; then
+		fetch  "$f" || continue
+		verify "$f" || continue
+	fi
 
 	if [ "${installed:-}" ]; then
 		for i in "${installed[@]}"; do