===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.105
retrieving revision 1.118
diff -u -r1.105 -r1.118
--- openbsd/fw_update/fw_install.sh	2021/12/22 17:53:53	1.105
+++ openbsd/fw_update/fw_install.sh	2021/12/24 00:46:02	1.118
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.105 2021/12/22 17:53:53 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.118 2021/12/24 00:46:02 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,26 +152,41 @@
 }
 
 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 () {
-	local _f="${1##*/}"
-	local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"
+	local _f="${1##*/}" _pkgname
+	local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
 	local flags=-VM
 	"$VERBOSE" && flags=-vm
 	ftp -D "Install" "$flags" -o- "file:${1}" |
-		tar -s ",^\+,${_pkgdir}/+," \
+		tar -s ",^\+,${_tmpdir}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
 
+	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
+	if [ ! "$_pkgname" ]; then
+		echo "Failed to extract name from $1, partial install" 2>&1
+		rm -rf "$_tmpdir"
+		return 1
+	fi
+
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_pkgdir}/+CONTENTS" <<EOL
+	ed -s "${_tmpdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -178,6 +194,9 @@
 .
 w
 EOL
+
+	chmod 755 "$_tmpdir"
+	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
 }
 
 delete_firmware() {
@@ -187,6 +206,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
@@ -216,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 ;;
@@ -249,14 +277,56 @@
 
 CFILE="$LOCALSRC/$CFILE"
 
-if "$INSTALL" && [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
+if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
 	echo "need root privileges" >&2
 	exit 1
 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" &&
@@ -266,13 +336,16 @@
 [ "${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
 fi
 
 added=''
 updated=''
+kept=''
 for f in "${devices[@]}"; do
 	d="$( firmware_devicename "$f" )"
 
@@ -285,12 +358,13 @@
 		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
 			if [ "${f##*/}" = "$i.tgz" ]; then
 				"$VERBOSE" && echo "$i already installed"
+				kept="$kept,$d"
 				continue 2
 			fi
 		done
@@ -300,11 +374,13 @@
 		if "$DOWNLOAD"; then
 			"$VERBOSE" && echo "Verify existing ${f##*/}"
 			verify "$f" || continue
+			"$INSTALL"  || kept="$kept,$d"
 		# else assume it was verified when downloaded
 		fi
 	elif "$DOWNLOAD"; then
 		fetch  "$f" || continue
 		verify "$f" || continue
+		"$INSTALL"  || added="$added,$d"
 	elif "$INSTALL"; then
 		echo "Cannot install ${f##*/}, not found" >&2
 		continue
@@ -323,18 +399,17 @@
 	add_firmware "$f"
 
 	if "$removed"; then
-		[ "$updated" ] && updated="$updated,"
-		updated="$updated$d"
+		updated="$updated,$d"
 	else
-		[ "$added" ] && added="$added,"
-		added="$added$d"
+		added="$added,$d"
 	fi
 done
 
-if ! $VERBOSE && { [ "$added" ] || [ "$updated" ]; }; then
-	echo  "${0##*/}: $(
-	    [ "$added" ] && echo -n "added ${added}"
-	    [ "$added" ] && [ "$updated" ] && echo -n "; "
-	    [ "$updated" ] && echo -n "updated ${updated}"
-	)"
+added="${added:#,}"
+updated="${updated:#,}"
+kept="${kept:#,}"
+if "$INSTALL"; then
+	echo  "${0##*/}: added ${added:-none}; updated ${updated:-none}; kept ${kept:-none}"
+else
+	echo  "${0##*/}: downloaded ${added:-none}; kept ${kept:-none}"
 fi