===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.57
retrieving revision 1.63
diff -u -r1.57 -r1.63
--- openbsd/fw_update/fw_install.sh	2021/12/08 03:45:05	1.57
+++ openbsd/fw_update/fw_install.sh	2021/12/09 02:23:15	1.63
@@ -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.63 2021/12/09 02:23:15 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -61,20 +61,17 @@
 fetch() {
 	local _file=$1 _user=_file _exit
 
-	>"$_file"
-	chown "$_user" "$_file"
-
 	# If we're not in the installer, we have su(1)
 	# and doas(1) is unlikely to be configured.
 	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}'"
+		        -o- '${FWURL}/${_file}'" > "$_file"
 		_exit="$?"
 	else
 		/usr/bin/doas -u "$_user" \
 		    ftp -D 'Get/Verify' -Vm \
-		        -o "$_file" "${FWURL}/${_file}"
+		        -o- "${FWURL}/${_file}" > "$_file"
 		_exit="$?"
 	fi
 
@@ -83,8 +80,6 @@
 		echo "Cannot fetch $_file" >&2
 		return 1
 	fi
-
-	chown root "$_file"
 }
 
 verify() {
@@ -136,7 +131,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,39 +181,91 @@
 	done
 }
 
-set -A devices -- $( devices_needing_firmware )
+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[*]:-}" ] ||
+    set -A devices -- $( devices_needing_firmware )
+
 if [ ! "${devices:-}" ]; then
 	echo "No devices found which need firmware files to be downloaded."
 	exit
 fi
 
-TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )
-cd "$TMPDIR"
+# 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
+		if [ "${DOWNLOADDIR:-}" ]; then
+			echo "Cannot download local file $f" >&2
+			exit 2
+		fi
+		devices[$i]="$d:$( realpath "$f" )"
+	fi
+	i=$((i + 1))
+done
 
-# To unpriv we need to let the unpriv user into this dir
-chmod go+x .
+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
 
 fetch "$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" || 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
+	if [ ! "${DOWNLOADDIR:-}" ] && [ "${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
+	elif [ "${DOWNLOADDIR:-}" ]; then
+		echo "Already have $f"
+		verify "$f" || continue
+	fi
+
+	[ "${DOWNLOADDIR:-}" ] && continue
 
 	if [ "${installed:-}" ]; then
 		for i in "${installed[@]}"; do