===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- openbsd/fw_update/fw_install.sh	2022/01/07 02:18:52	1.145
+++ openbsd/fw_update/fw_install.sh	2022/01/07 04:22:29	1.146
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.145 2022/01/07 02:18:52 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.146 2022/01/07 04:22:29 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -120,6 +120,8 @@
 		echo "Cannot fetch $_src$_error" >&2
 		return 1
 	fi
+
+	return 0
 }
 
 fetch_cfile() {
@@ -133,15 +135,19 @@
 		echo "${0##*/}: $CFILE: No such file or directory" >&2
 		return 2
 	fi
+
+	return 0
 }
 
 verify() {
-	[ -e "$CFILE" ] || fetch_cfile
+	[ -e "$CFILE" ] || fetch_cfile || return 1
 	# On the installer we don't get sha256 -C, so fake it.
 	if ! fgrep -qx "SHA256 (${1##*/}) = $( /bin/sha256 -qb "$1" )" "$CFILE"; then
 		echo "Checksum test for ${1##*/} failed." >&2
 		return 1
 	fi
+
+	return 0
 }
 
 firmware_in_dmesg() {
@@ -166,7 +172,7 @@
 
 firmware_filename() {
 	local _f
-	[ -e "$CFILE" ] || fetch_cfile
+	[ -e "$CFILE" ] || fetch_cfile || return 1
 	_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"
@@ -432,6 +438,7 @@
 for f in "${devices[@]}"; do
 	d="$( firmware_devicename "$f" )"
 
+	verify_existing="$DOWNLOAD"
 	if [ "$f" = "$d" ]; then
 		f=$( firmware_filename "$d" || true )
 		[ "$f" ] || continue
@@ -439,6 +446,10 @@
 	elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then
 		echo "Cannot download local file $f" >&2
 		exit 2
+	else
+		# If someone specified a filename on the command-line
+		# we don't want to verify it.
+		verify_existing=false
 	fi
 
 	set -A installed -- $( installed_firmware '' "$d-firmware-" '*' )
@@ -455,9 +466,14 @@
 
 	if [ -e "$f" ]; then
 		if "$DOWNLOAD"; then
-			[ "$VERBOSE" -gt 1 ] && ! "$INSTALL" &&
-			    echo "Keep/Verify ${f##*/}"
-			"$DRYRUN"  || verify "$f" || continue
+			if "$verify_existing" && ! "$DRYRUN"; then
+				[ "$VERBOSE" -gt 1 ] && ! "$INSTALL" &&
+				    echo "Keep/Verify ${f##*/}"
+				verify "$f" || continue
+			else
+				[ "$VERBOSE" -gt 1 ] && ! "$INSTALL" &&
+				    echo "Keep ${f##*/}"
+			fi
 			"$INSTALL" || kept="$kept,$d"
 		# else assume it was verified when downloaded
 		fi