===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.107
retrieving revision 1.113
diff -u -r1.107 -r1.113
--- openbsd/fw_update/fw_install.sh	2021/12/23 02:16:03	1.107
+++ openbsd/fw_update/fw_install.sh	2021/12/23 21:34:12	1.113
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.107 2021/12/23 02:16:03 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.113 2021/12/23 21:34:12 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -35,6 +35,7 @@
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
 VERBOSE=false
+DELETE=false
 DOWNLOAD=true
 INSTALL=true
 LOCALSRC=
@@ -151,12 +152,20 @@
 }
 
 installed_firmware() {
-	set +o noglob
-	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
-		[ -e "$fw/+CONTENTS" ] || continue
+	local _pre="$1" _match="$2" _post="$3" _firmware
+	set -A _firmware -- $(
+	    set +o noglob
+	    grep -Fxl '@option firmware' \
+		"${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \
+		2>/dev/null || true
+	    set -o noglob
+	)
+
+	[ "${_firmware[*]:-}" ] || return 0
+	for fw in "${_firmware[@]}"; do
+		fw="${fw%/+CONTENTS}"
 		echo "${fw##*/}"
 	done
-	set -o noglob
 }
 
 add_firmware () {
@@ -232,15 +241,18 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-v] [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-d | -D | -L] [-av] [driver | file ...]"
 	exit 2
 }
 
+ALL=false
 OPT_D=
 OPT_L=
-while getopts :DLv name
+while getopts :adDLv name
 do
        case "$name" in
+       a) ALL=true ;;
+       d) DELETE=true ;;
        D) OPT_D=true ;;
        L) OPT_L=true ;;
        v) VERBOSE=true ;;
@@ -265,14 +277,58 @@
 
 CFILE="$LOCALSRC/$CFILE"
 
-if "$INSTALL" && [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
-	echo "need root privileges" >&2
-	exit 1
+if "$INSTALL" || "$DELETE"; then
+	if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
+		echo "need root privileges" >&2
+		exit 1
+	fi
 fi
 
 set -A devices -- "$@"
 
-if [ ! "${devices[*]:-}" ]; then
+if "$DELETE"; then
+	[ "$OPT_D" ] || [ "$OPT_L" ] && usage 22
+
+	set -A installed
+	if [ "${devices[*]:-}" ]; then
+		"$ALL" && usage 22
+
+		set -A installed -- $(
+		    for d in "${devices[@]}"; do
+			f="${d##*/}"  # only care about the name
+			f="${f%.tgz}" # allow specifying the package name
+			[ "$( firmware_devicename "$f" )" = "$f" ] && f="$f-firmware"
+
+			set -A i -- $( installed_firmware '' "$f-" '*' )
+
+			if [ "${i[*]:-}" ]; then
+				echo "${i[@]}"
+			else
+				echo "No firmware found for '$d'" >&2
+			fi
+		    done
+		)
+	elif "$ALL"; then
+		set -A installed -- $( installed_firmware '*' '-firmware-' '*' )
+	fi
+
+	deleted=''
+	if [ "${installed:-}" ]; then
+		for fw in "${installed[@]}"; do
+			delete_firmware "$fw" || continue
+			deleted="$deleted,$( firmware_devicename "$fw" )"
+		done
+	fi
+
+	deleted="${deleted:+${deleted#,}}"
+	echo "${0:##*/}: deleted ${deleted:-none}";
+
+	exit
+fi
+
+if [ "${devices[*]:-}" ]; then
+	"$ALL" && usage 22
+else
 	"$VERBOSE" && echo -n "Detecting firmware ..."
 	set -A devices -- $( devices_needing_firmware )
 	"$VERBOSE" &&
@@ -301,7 +357,7 @@
 		exit 2
 	fi
 
-	set -A installed -- $( installed_firmware "$d" )
+	set -A installed -- $( installed_firmware '' "$d-firmware-" '*' )
 
 	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do