===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.106
retrieving revision 1.108
diff -u -r1.106 -r1.108
--- openbsd/fw_update/fw_install.sh	2021/12/23 01:25:29	1.106
+++ openbsd/fw_update/fw_install.sh	2021/12/23 03:45:46	1.108
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.106 2021/12/23 01:25:29 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.108 2021/12/23 03:45:46 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -197,6 +197,12 @@
 	"$VERBOSE" && echo "Uninstalling $_pkg"
 	_cwd="${_pkgdir}/$_pkg"
 
+	if [ ! -e "$_cwd/+CONTENTS" ] ||
+	    ! grep -Fxq '@option firmware' "$_cwd/+CONTENTS"; then
+		echo "${0##*/}: $_pkg does not appear to be firmware" >&2
+		return 2
+	fi
+
 	set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"
 
 	while read -r c g; do
@@ -226,7 +232,7 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-v] [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-D | -L] [-v] [driver | file ...]"
 	exit 2
 }