===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.91
retrieving revision 1.102
diff -u -r1.91 -r1.102
--- openbsd/fw_update/fw_install.sh	2021/12/19 20:04:42	1.91
+++ openbsd/fw_update/fw_install.sh	2021/12/22 04:43:41	1.102
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.91 2021/12/19 20:04:42 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.102 2021/12/22 04:43:41 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=
@@ -55,23 +56,25 @@
 }
 
 fetch() {
-	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit
+	local _src="${FWURL}/${1##*/}" _dst=$1 _user=_file _pid _exit _error=''
 
 	# If we're not in the installer,
 	# 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
@@ -84,7 +87,7 @@
 				sleep 1
 			else
 				kill -INT -"$_pid"
-				echo "fetch timed out" >&2
+				_error=" (timed out)"
 			fi
 		else
 			sleep 1
@@ -100,7 +103,7 @@
 
 	if [ "$_exit" -ne 0 ]; then
 		rm -f "$_dst"
-		echo "Cannot fetch $_src" >&2
+		echo "Cannot fetch $_src$_error" >&2
 		return 1
 	fi
 }
@@ -148,16 +151,20 @@
 }
 
 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}" |
+	local flags=-VM
+	"$VERBOSE" && flags=-vm
+	ftp -D "Install" "$flags" -o- "file:${1}" |
 		tar -s ",^\+,${_pkgdir}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
@@ -177,7 +184,7 @@
 	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 +206,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 +216,19 @@
 }
 
 usage() {
-	echo "usage: fw_install [-D | -L] [driver | file ...]"
+	echo "usage:  ${0##*/} [-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,17 +244,23 @@
 	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
+	echo "need root privileges" >&2
+	exit 1
+fi
+
 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
@@ -272,7 +288,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
@@ -280,7 +296,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