===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.127
retrieving revision 1.131
diff -u -r1.127 -r1.131
--- openbsd/fw_update/fw_install.sh	2021/12/25 02:38:33	1.127
+++ openbsd/fw_update/fw_install.sh	2021/12/25 19:03:56	1.131
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.127 2021/12/25 02:38:33 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.131 2021/12/25 19:03:56 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -34,6 +34,7 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
+DRYRUN=false
 VERBOSE=false
 DELETE=false
 DOWNLOAD=true
@@ -41,10 +42,12 @@
 LOCALSRC=
 
 unset FTPPID
+unset FWPKGTMP
 REMOVE_LOCALSRC=false
 cleanup() {
 	set +o errexit # ignore errors from killing ftp
-	[ "${FTPPID:-}" ] && kill -TERM -"$FTPPID" #2>/dev/null
+	[ "${FTPPID:-}" ] && kill -TERM -"$FTPPID" 2>/dev/null
+	[ "${FWPKGTMP:-}" ] && rm -rf "$FWPKGTMP"
 	"$REMOVE_LOCALSRC" && rm -rf "$LOCALSRC"
 }
 trap cleanup EXIT
@@ -195,23 +198,24 @@
 
 add_firmware () {
 	local _f="${1##*/}" _pkgname
-	local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
+	FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
 	local flags=-VM
 	"$VERBOSE" && flags=-vm
 	ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" |
-		tar -s ",^\+,${_tmpdir}/+," \
+		tar -s ",^\+,${FWPKGTMP}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
 
-	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
+	_pkgname="$( sed -n '/^@name /{s///p;q;}' "${FWPKGTMP}/+CONTENTS" )"
 	if [ ! "$_pkgname" ]; then
 		echo "Failed to extract name from $1, partial install" 2>&1
-		rm -rf "$_tmpdir"
+		rm -rf "$FWPKGTMP"
+		unset FWPKGTMP
 		return 1
 	fi
 
 	# TODO: Should we mark these so real fw_update can -Drepair?
-	ed -s "${_tmpdir}/+CONTENTS" <<EOL
+	ed -s "${FWPKGTMP}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a
 @option manual-installation
 @option firmware
@@ -220,8 +224,9 @@
 w
 EOL
 
-	chmod 755 "$_tmpdir"
-	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	chmod 755 "$FWPKGTMP"
+	mv "$FWPKGTMP" "${DESTDIR}/var/db/pkg/${_pkgname}"
+	unset FWPKGTMP
 }
 
 delete_firmware() {
@@ -272,12 +277,13 @@
 
 ALL=false
 OPT_D=
-while getopts :adDp:v name
+while getopts :adDnp:v name
 do
        case "$name" in
        a) ALL=true ;;
        d) DELETE=true ;;
        D) OPT_D=true ;;
+       n) DRYRUN=true ;;
        p) LOCALSRC="$OPTARG" ;;
        v) VERBOSE=true ;;
        :)
@@ -308,6 +314,8 @@
 if [ "$OPT_D" ]; then
 	INSTALL=false
 	LOCALSRC="${LOCALSRC:-.}"
+elif [ "$LOCALSRC" ]; then
+	DOWNLOAD=false
 fi
 
 if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
@@ -346,7 +354,11 @@
 	deleted=''
 	if [ "${installed:-}" ]; then
 		for fw in "${installed[@]}"; do
-			delete_firmware "$fw" || continue
+			if "$DRYRUN"; then
+				echo "Delete $fw"
+			else
+				delete_firmware "$fw" || continue
+			fi
 			deleted="$deleted,$( firmware_devicename "$fw" )"
 		done
 	fi
@@ -407,7 +419,7 @@
 	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
-				"$VERBOSE" && echo "$i already installed"
+				"$VERBOSE" && echo "Keep $i"
 				kept="$kept,$d"
 				continue 2
 			fi
@@ -416,14 +428,23 @@
 
 	if [ -e "$f" ]; then
 		if "$DOWNLOAD"; then
-			"$VERBOSE" && echo "Verify existing ${f##*/}"
-			verify "$f" || continue
-			"$INSTALL"  || kept="$kept,$d"
+			if "$VERBOSE"; then
+				"$INSTALL" &&
+				    echo "Verify ${f##*/}" ||
+				    echo "Keep/Verify ${f##*/}"
+				echo "Verify ${f##*/}"
+			fi
+			"$DRYRUN"  || verify "$f" || continue
+			"$INSTALL" || kept="$kept,$d"
 		# else assume it was verified when downloaded
 		fi
 	elif "$DOWNLOAD"; then
-		fetch  "$f" || continue
-		verify "$f" || continue
+		if "$DRYRUN"; then
+			"$VERBOSE" && echo "Get/Verify ${f##*/}"
+		else
+			fetch  "$f" || continue
+			verify "$f" || continue
+		fi
 		"$INSTALL"  || added="$added,$d"
 	elif "$INSTALL"; then
 		echo "Cannot install ${f##*/}, not found" >&2
@@ -435,16 +456,20 @@
 	removed=false
 	if [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
-			delete_firmware "$i"
+			"$DRYRUN" || delete_firmware "$i"
 			removed=true
 		done
 	fi
 
-	add_firmware "$f"
+	"$DRYRUN" || add_firmware "$f"
 
+	f="${f##*/}"
+	f="${f%.tgz}"
 	if "$removed"; then
+		"$DRYRUN" && echo "Update $f"
 		updated="$updated,$d"
 	else
+		"$DRYRUN" && echo "Install $f"
 		added="$added,$d"
 	fi
 done