===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.57
retrieving revision 1.59
diff -u -r1.57 -r1.59
--- openbsd/fw_update/fw_install.sh	2021/12/08 03:45:05	1.57
+++ 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.57 2021/12/08 03:45:05 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>
 #
@@ -136,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," \
@@ -186,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"
 
@@ -204,21 +233,29 @@
     echo "Signature check of SHA256.sig failed" >&2 && exit 1
 
 for d in "${devices[@]}"; do
-	f=$( firmware_filename "$d" || true )
-	[ "$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