===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.71
retrieving revision 1.76
diff -u -r1.71 -r1.76
--- openbsd/fw_update/fw_install.sh	2021/12/11 05:38:23	1.71
+++ openbsd/fw_update/fw_install.sh	2021/12/11 21:11:02	1.76
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.71 2021/12/11 05:38:23 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.76 2021/12/11 21:11:02 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -121,14 +121,15 @@
 }
 
 add_firmware () {
-	local _f="${1##*/}" _pkgdir="${DESTDIR}/var/db/pkg"
+	local _f="${1##*/}"
+	local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"
 	ftp -D "Install" -Vmo- "file:${1}" |
-		tar -s ",^\+,${_pkgdir}/${_f%.tgz}/+," \
+		tar -s ",^\+,${_pkgdir}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
 
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_pkgdir}/${_f%.tgz}/+CONTENTS" <<EOL
+	ed -s "${_pkgdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -218,7 +219,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
@@ -234,14 +235,18 @@
 		done
 	fi
 
-	if [ ! -e "$f" ]; then
-		"$INSTALL" && ! "$DOWNLOAD" &&
-		    echo "Cannot install ${f##*/}, not found" >&2 && continue
+	if [ -e "$f" ]; then
+		if "$DOWNLOAD"; then
+			echo "Verify existing ${f##*/}"
+			verify "$f" || continue
+		# else assume it was verified when downloaded
+		fi
+	elif "$DOWNLOAD"; then
 		fetch  "$f" || continue
 		verify "$f" || continue
-	elif $DOWNLOAD; then
-		echo "Already have $f"
-		verify "$f" || continue
+	elif "$INSTALL"; then
+		echo "Cannot install ${f##*/}, not found" >&2
+		continue
 	fi
 
 	"$INSTALL" || continue