===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.141
retrieving revision 1.145
diff -u -r1.141 -r1.145
--- openbsd/fw_update/fw_install.sh	2022/01/06 16:38:24	1.141
+++ openbsd/fw_update/fw_install.sh	2022/01/07 02:18:52	1.145
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.141 2022/01/06 16:38:24 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.145 2022/01/07 02:18:52 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -122,7 +122,21 @@
 	fi
 }
 
+fetch_cfile() {
+	if "$DOWNLOAD"; then
+		set +o noclobber # we want to get the latest CFILE
+		fetch "$CFILE" || return 1
+		set -o noclobber
+		! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
+		    echo "Signature check of SHA256.sig failed" >&2 && return 1
+	elif [ ! -e "$CFILE" ]; then
+		echo "${0##*/}: $CFILE: No such file or directory" >&2
+		return 2
+	fi
+}
+
 verify() {
+	[ -e "$CFILE" ] || fetch_cfile
 	# 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
@@ -152,6 +166,7 @@
 
 firmware_filename() {
 	local _f
+	[ -e "$CFILE" ] || fetch_cfile
 	_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"
@@ -286,25 +301,25 @@
 }
 
 ALL=false
-OPT_D=
-while getopts :adDnp:v name
+OPT_F=
+while getopts :adFnp:v name
 do
-       case "$name" in
-       a) ALL=true ;;
-       d) DELETE=true ;;
-       D) OPT_D=true ;;
-       n) DRYRUN=true ;;
-       p) LOCALSRC="$OPTARG" ;;
-       v) VERBOSE=$(( VERBOSE + 1 )) ;;
-       :)
-	   echo "${0##*/}: option requires an argument -- -$OPTARG" >&2
-	   usage 2
-	   ;;
-       ?)
-	   echo "${0##*/}: unknown option -- -$OPTARG" >&2
-	   usage 2
-	   ;;
-       esac
+	case "$name" in
+	a) ALL=true ;;
+	d) DELETE=true ;;
+	F) OPT_F=true ;;
+	n) DRYRUN=true ;;
+	p) LOCALSRC="$OPTARG" ;;
+	v) VERBOSE=$(( VERBOSE + 1 )) ;;
+	:)
+	    echo "${0##*/}: option requires an argument -- -$OPTARG" >&2
+	    usage 2
+	    ;;
+	?)
+	    echo "${0##*/}: unknown option -- -$OPTARG" >&2
+	    usage 2
+	    ;;
+	esac
 done
 shift $((OPTIND - 1))
 
@@ -321,9 +336,20 @@
 fi
 
 # "Download only" means local dir and don't install
-if [ "$OPT_D" ]; then
+if [ "$OPT_F" ]; then
 	INSTALL=false
 	LOCALSRC="${LOCALSRC:-.}"
+
+	# Always check for latest CFILE and so latest firmware
+	if [ -e "$LOCALSRC/$CFILE" ]; then
+		mv "$LOCALSRC/$CFILE" "$LOCALSRC/$CFILE-OLD"
+		if fetch_cfile; then
+			rm -f "$LOCALSRC/$CFILE-OLD"
+		else
+			mv "$LOCALSRC/$CFILE-OLD" "$LOCALSRC/$CFILE"
+			echo "Using existing $CFILE" >&2
+		fi
+	fi
 elif [ "$LOCALSRC" ]; then
 	DOWNLOAD=false
 fi
@@ -336,7 +362,7 @@
 set -sA devices -- "$@"
 
 if "$DELETE"; then
-	[ "$OPT_D" ] && usage 22
+	[ "$OPT_F" ] && usage 22
 
 	# Show the "Uninstalling" message when just deleting not upgrading
 	[ "$VERBOSE" -gt 0 ] && VERBOSE=3
@@ -383,8 +409,8 @@
 fi
 
 if [ ! "$LOCALSRC" ]; then
-    LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
-    REMOVE_LOCALSRC=true
+	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
+	REMOVE_LOCALSRC=true
 fi
 
 CFILE="$LOCALSRC/$CFILE"
@@ -399,18 +425,6 @@
 fi
 
 [ "${devices[*]:-}" ] || exit
-
-if "$DOWNLOAD"; then
-	set +o noclobber # we want to get the latest CFILE
-	fetch "$CFILE"
-	set -o noclobber
-	! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" &&
-	    echo "Signature check of SHA256.sig failed" >&2 && exit 1
-elif [ ! -e "$CFILE" ]; then
-	# TODO: We shouldn't need a CFILE if all arguments are files.
-	echo "${0##*/}: $CFILE: No such file or directory" >&2
-	exit 2
-fi
 
 added=''
 updated=''