===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.74
retrieving revision 1.81
diff -u -r1.74 -r1.81
--- openbsd/fw_update/fw_install.sh	2021/12/11 20:57:51	1.74
+++ openbsd/fw_update/fw_install.sh	2021/12/12 20:23:12	1.81
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.74 2021/12/11 20:57:51 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.81 2021/12/12 20:23:12 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -16,6 +16,7 @@
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 set -o errexit -o pipefail -o nounset
+export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
 CFILE=SHA256.sig
 DESTDIR=${DESTDIR:-}
@@ -38,7 +39,7 @@
 	local _i=1 _dir
 
 	# If we're not in the installer,
-	# we have mktemp and a more hostile environment
+	# we have mktemp and a more hostile environment.
 	if [ -x /usr/bin/mktemp ]; then
 		_dir=$( mktemp -d "${1}-XXXXXXXXX" )
 	else
@@ -53,8 +54,8 @@
 fetch() {
 	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _exit
 
-	# If we're not in the installer, we have su(1)
-	# and doas(1) is unlikely to be configured.
+	# 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- '$_src'" > "$_dst"
@@ -173,7 +174,7 @@
 }
 
 usage() {
-	echo "usage: fw_install [-d dir | -L dir] [driver | file [...]]"
+	echo "usage: fw_install [-DL] [driver | file [...]]"
 	exit 2
 }
 
@@ -184,7 +185,7 @@
 do
        case "$name" in
        # "download only" means local dir and don't install
-       d) LOCALSRC=. INSTALL=false ;;
+       D) LOCALSRC=. INSTALL=false ;;
        L) LOCALSRC=. ;;
        ?) usage 2 ;;
        esac
@@ -196,6 +197,8 @@
 [ "$LOCALSRC" ] && "$INSTALL" && DOWNLOAD=false
 [ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"
 
+CFILE="$LOCALSRC/$CFILE"
+
 set -A devices -- "$@"
 
 [ "${devices[*]:-}" ] ||
@@ -219,7 +222,7 @@
 		f=$( firmware_filename "$d" || true )
 		[ "$f" ] || continue
 		f="$LOCALSRC/$f"
-	elif ! "$INSTALL" && ! grep -q "($f)" "$CFILE" ; then
+	elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then
 		echo "Cannot download local file $f" >&2
 		exit 2
 	fi
@@ -241,12 +244,12 @@
 			verify "$f" || continue
 		# else assume it was verified when downloaded
 		fi
-	elif "$INSTALL" && ! "$DOWNLOAD"; then
-		echo "Cannot install ${f##*/}, not found" >&2
-		continue
-	else
+	elif "$DOWNLOAD"; then
 		fetch  "$f" || continue
 		verify "$f" || continue
+	elif "$INSTALL"; then
+		echo "Cannot install ${f##*/}, not found" >&2
+		continue
 	fi
 
 	"$INSTALL" || continue