===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.58
retrieving revision 1.61
diff -u -r1.58 -r1.61
--- openbsd/fw_update/fw_install.sh	2021/12/08 03:51:48	1.58
+++ openbsd/fw_update/fw_install.sh	2021/12/09 02:17:15	1.61
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.58 2021/12/08 03:51:48 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.61 2021/12/09 02:17:15 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -186,6 +186,21 @@
 	done
 }
 
+usage() {
+	echo "Usage: fw_install [ -d dir ] [ driver | file [ ... ] ]"
+	exit 2
+}
+
+DOWNLOADDIR=
+while getopts d: name
+do
+       case "$name" in
+       d) DOWNLOADDIR=$OPTARG ;;
+       ?) usage 2 ;;
+       esac
+done
+shift $((OPTIND - 1))
+
 set -A devices -- "$@"
 
 [ "${devices[*]:-}" ] ||
@@ -204,13 +219,24 @@
 	d=$( firmware_devicename "$f" )
 	[ "$f" = "$d" ] && f="$( echo "$f"-firmware-*.tgz | sed '$!d' )"
 	if [ -e "$f" ]; then
+		if [ "${DOWNLOADDIR:-}" ]; then
+			echo "Cannot download local file $f" >&2
+			exit 2
+		fi
 		devices[$i]="$d:$( realpath "$f" )"
 	fi
 	i=$((i + 1))
 done
 
-TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )
-cd "$TMPDIR"
+if [ "$DOWNLOADDIR" ]; then
+	if ! cd "$DOWNLOADDIR"; then
+		echo "Unable to use $DOWNLOADDIR, make sure it is a directory"
+		exit 2
+	fi
+else
+	TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )
+	cd "$TMPDIR"
+fi
 
 # To unpriv we need to let the unpriv user into this dir
 chmod go+x .
@@ -230,7 +256,7 @@
 
 	set -A installed -- $( installed_firmware "$d" )
 
-	if [ "${installed:-}" ]; then
+	if [ ! "${DOWNLOADDIR:-}" ] && [ "${installed:-}" ]; then
 		for i in "${installed[@]:-}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
 				echo "$i already installed"
@@ -242,7 +268,12 @@
 	if [ ! -e "$f" ]; then
 		fetch  "$f" || continue
 		verify "$f" || continue
+	elif [ "${DOWNLOADDIR:-}" ]; then
+		echo "Already have $f"
+		verify "$f" || continue
 	fi
+
+	[ "${DOWNLOADDIR:-}" ] && continue
 
 	if [ "${installed:-}" ]; then
 		for i in "${installed[@]}"; do