===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.94
retrieving revision 1.106
diff -u -r1.94 -r1.106
--- openbsd/fw_update/fw_install.sh	2021/12/21 02:16:01	1.94
+++ openbsd/fw_update/fw_install.sh	2021/12/23 01:25:29	1.106
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.94 2021/12/21 02:16:01 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.106 2021/12/23 01:25:29 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -15,7 +15,7 @@
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
-set -o errexit -o pipefail -o nounset
+set -o errexit -o pipefail -o nounset -o noclobber -o noglob
 set +o monitor
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin
 
@@ -34,6 +34,7 @@
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
 
+VERBOSE=false
 DOWNLOAD=true
 INSTALL=true
 LOCALSRC=
@@ -61,17 +62,19 @@
 	# we have su(1) and doas(1) is unlikely to be configured.
 	set -o monitor # make sure ftp gets its own process group
 	(
+	flags=-VM
+	"$VERBOSE" && flags=-vm
 	if [ -x /usr/bin/su ]; then
 		exec /usr/bin/su -s /bin/ksh "$_user" -c \
-		    "/usr/bin/ftp -D 'Get/Verify' -Vm -o- '$_src'" > "$_dst"
+		    "/usr/bin/ftp -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
 	else
 		exec /usr/bin/doas -u "$_user" \
-		    /usr/bin/ftp -D 'Get/Verify' -Vm -o- "$_src" > "$_dst"
+		    /usr/bin/ftp -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
 	fi
 	) & _pid=$!
 	set +o monitor
 
-	trap "kill -TERM '-$_pid'; exit 1" EXIT INT QUIT ABRT TERM
+	trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM
 
 	SECONDS=0
 	_last=0
@@ -148,22 +151,33 @@
 }
 
 installed_firmware() {
+	set +o noglob
 	for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
-		[ -e "$fw" ] || continue
+		[ -e "$fw/+CONTENTS" ] || continue
 		echo "${fw##*/}"
 	done
+	set -o noglob
 }
 
 add_firmware () {
-	local _f="${1##*/}"
-	local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"
-	ftp -D "Install" -Vmo- "file:${1}" |
-		tar -s ",^\+,${_pkgdir}/+," \
+	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 ",^\+,${_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
@@ -171,13 +185,16 @@
 .
 w
 EOL
+
+	chmod 755 "$_tmpdir"
+	mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
 }
 
 delete_firmware() {
 	local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg"
 
 	# TODO: Check hash for files before deleting
-	echo "Uninstalling $_pkg"
+	"$VERBOSE" && echo "Uninstalling $_pkg"
 	_cwd="${_pkgdir}/$_pkg"
 
 	set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"
@@ -199,7 +216,9 @@
 		if [ -d "$_r" ]; then
 			# Try hard not to actually remove recursively
 			# without rmdir on the install media.
+			set +o noglob
 			[ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"
+			set -o noglob
 		else
 			rm -f "$_r"
 		fi
@@ -207,18 +226,19 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-v] [-D | -L] [driver | file ...]"
 	exit 2
 }
 
 OPT_D=
 OPT_L=
-while getopts DL name
+while getopts :DLv name
 do
        case "$name" in
        D) OPT_D=true ;;
        L) OPT_L=true ;;
-       ?) usage 2 ;;
+       v) VERBOSE=true ;;
+       ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
        esac
 done
 shift $((OPTIND - 1))
@@ -234,12 +254,12 @@
 	DOWNLOAD=false
 	LOCALSRC=.
 else
-	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"
+	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
 fi
 
 CFILE="$LOCALSRC/$CFILE"
 
-if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then
+if "$INSTALL" && [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
 	echo "need root privileges" >&2
 	exit 1
 fi
@@ -247,9 +267,10 @@
 set -A devices -- "$@"
 
 if [ ! "${devices[*]:-}" ]; then
-	echo -n "Detecting firmware ..."
+	"$VERBOSE" && echo -n "Detecting firmware ..."
 	set -A devices -- $( devices_needing_firmware )
-	[ "${devices[*]:-}" ] && echo " found." || echo " done."
+	"$VERBOSE" &&
+	    { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; }
 fi
 
 [ "${devices[*]:-}" ] || exit
@@ -260,6 +281,8 @@
 	    echo "Signature check of SHA256.sig failed" >&2 && exit 1
 fi
 
+added=''
+updated=''
 for f in "${devices[@]}"; do
 	d="$( firmware_devicename "$f" )"
 
@@ -277,7 +300,7 @@
 	if "$INSTALL" && [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
-				echo "$i already installed"
+				"$VERBOSE" && echo "$i already installed"
 				continue 2
 			fi
 		done
@@ -285,7 +308,7 @@
 
 	if [ -e "$f" ]; then
 		if "$DOWNLOAD"; then
-			echo "Verify existing ${f##*/}"
+			"$VERBOSE" && echo "Verify existing ${f##*/}"
 			verify "$f" || continue
 		# else assume it was verified when downloaded
 		fi
@@ -299,12 +322,29 @@
 
 	"$INSTALL" || continue
 
+	removed=false
 	if [ "${installed[*]:-}" ]; then
 		for i in "${installed[@]}"; do
 			delete_firmware "$i"
+			removed=true
 		done
 	fi
 
 	add_firmware "$f"
+
+	if "$removed"; then
+		[ "$updated" ] && updated="$updated,"
+		updated="$updated$d"
+	else
+		[ "$added" ] && added="$added,"
+		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}"
+	)"
+fi