===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.113
retrieving revision 1.122
diff -u -r1.113 -r1.122
--- openbsd/fw_update/fw_install.sh	2021/12/23 21:34:12	1.113
+++ openbsd/fw_update/fw_install.sh	2021/12/24 02:36:13	1.122
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.113 2021/12/23 21:34:12 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.122 2021/12/24 02:36:13 afresh1 Exp $
 #
 # Copyright (c) 2021 Andrew Hewus Fresh <afresh1@openbsd.org>
 #
@@ -67,10 +67,10 @@
 	"$VERBOSE" && flags=-vm
 	if [ -x /usr/bin/su ]; then
 		exec /usr/bin/su -s /bin/ksh "$_user" -c \
-		    "/usr/bin/ftp -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
+		    "/usr/bin/ftp -N '${0##/}' -D 'Get/Verify' $flags -o- '$_src'" > "$_dst"
 	else
 		exec /usr/bin/doas -u "$_user" \
-		    /usr/bin/ftp -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
+		    /usr/bin/ftp -N "${0##/}" -D 'Get/Verify' $flags -o- "$_src" > "$_dst"
 	fi
 	) & _pid=$!
 	set +o monitor
@@ -173,7 +173,7 @@
 	local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
 	local flags=-VM
 	"$VERBOSE" && flags=-vm
-	ftp -D "Install" "$flags" -o- "file:${1}" |
+	ftp -N "${0##/}" -D "Install" "$flags" -o- "file:${1}" |
 		tar -s ",^\+,${_tmpdir}/+," \
 		    -s ",^firmware,${DESTDIR}/etc/firmware," \
 		    -C / -zxphf - "+*" "firmware/*"
@@ -241,53 +241,63 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-d | -D | -L] [-av] [driver | file ...]"
+	echo "usage:  ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]"
 	exit 2
 }
 
 ALL=false
 OPT_D=
-OPT_L=
-while getopts :adDLv name
+while getopts :adDp:v name
 do
        case "$name" in
        a) ALL=true ;;
        d) DELETE=true ;;
        D) OPT_D=true ;;
-       L) OPT_L=true ;;
+       p) LOCALSRC="$OPTARG" ;;
        v) VERBOSE=true ;;
-       ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
+       :)
+	   echo "${0##*/}: option requires an argument -- -$OPTARG" >&2
+	   usage 2
+	   ;;
+       ?)
+	   echo "${0##*/}: unknown option -- -$OPTARG" >&2
+	   usage 2
+	   ;;
        esac
 done
 shift $((OPTIND - 1))
 
-[ "$OPT_D" ] && [ "$OPT_L" ] && usage 1
+if [ "$LOCALSRC" ]; then
+	if [[ $LOCALSRC = @(ftp|http?(s))://* ]]; then
+		FWURL="${LOCALSRC}"
+		LOCALSRC=
+	else
+		LOCALSRC="${LOCALSRC:#file:}"
+		! [ -d "$LOCALSRC" ] &&
+		    echo "The path must be a URL or an existing directory" >&2 &&
+		    exit 2
+	fi
+fi
 
+# "Download only" means local dir and don't install
 if [ "$OPT_D" ]; then
-	# "Download only" means local dir and don't install
 	INSTALL=false
-	LOCALSRC=.
-elif [ "$OPT_L" ]; then
-	# "Local" means don't download, install from local dir
-	DOWNLOAD=false
-	LOCALSRC=.
-else
-	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
+	LOCALSRC="${LOCALSRC:-.}"
 fi
 
+[ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
+
 CFILE="$LOCALSRC/$CFILE"
 
-if "$INSTALL" || "$DELETE"; then
-	if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
-		echo "need root privileges" >&2
-		exit 1
-	fi
+if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
+	echo "need root privileges" >&2
+	exit 1
 fi
 
 set -A devices -- "$@"
 
 if "$DELETE"; then
-	[ "$OPT_D" ] || [ "$OPT_L" ] && usage 22
+	[ "$OPT_D" ] && usage 22
 
 	set -A installed
 	if [ "${devices[*]:-}" ]; then
@@ -338,13 +348,20 @@
 [ "${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
+elif [ ! -e "$CFILE" ]; then
+	# TODO: We shouldn't need a CFILE if all arguments are files.
+	echo "${0##*/}: $CFILE: No such file or directory" >&2
+	exit 2
 fi
 
 added=''
 updated=''
+kept=''
 for f in "${devices[@]}"; do
 	d="$( firmware_devicename "$f" )"
 
@@ -363,6 +380,7 @@
 		for i in "${installed[@]}"; do
 			if [ "${f##*/}" = "$i.tgz" ]; then
 				"$VERBOSE" && echo "$i already installed"
+				kept="$kept,$d"
 				continue 2
 			fi
 		done
@@ -372,11 +390,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
@@ -395,18 +415,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