===================================================================
RCS file: /cvs/openbsd/fw_update/fw_install.sh,v
retrieving revision 1.118
retrieving revision 1.121
diff -u -r1.118 -r1.121
--- openbsd/fw_update/fw_install.sh	2021/12/24 00:46:02	1.118
+++ openbsd/fw_update/fw_install.sh	2021/12/24 02:27:46	1.121
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: fw_install.sh,v 1.118 2021/12/24 00:46:02 afresh1 Exp $
+#	$OpenBSD: fw_install.sh,v 1.121 2021/12/24 02:27:46 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,37 +241,61 @@
 }
 
 usage() {
-	echo "usage:  ${0##*/} [-d | -D | -L] [-av] [driver | file ...]"
+	echo "usage:  ${0##*/} [-d | -D | -L] [-av] [-p path] [driver | file ...]"
 	exit 2
 }
 
 ALL=false
 OPT_D=
 OPT_L=
-while getopts :adDLv name
+while getopts :adDLp: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
+		# If we've not specifically asked to download to this path
+		# then we are installing from the local dir and no downloading.
+		[ "$OPT_D" ] || DOWNLOAD=false
+		LOCALSRC="${LOCALSRC:#file:}"
+
+		! [ -d "$LOCALSRC" ] &&
+		    echo "The path must be a URL or an existing directory" >&2 &&
+		    exit 2
+	fi
+fi
+
 if [ "$OPT_D" ]; then
 	# "Download only" means local dir and don't install
 	INSTALL=false
-	LOCALSRC=.
+	LOCALSRC="${LOCALSRC:-.}"
 elif [ "$OPT_L" ]; then
 	# "Local" means don't download, install from local dir
 	DOWNLOAD=false
-	LOCALSRC=.
-else
+	LOCALSRC="${LOCALSRC:-.}"
+elif [ ! "$LOCALSRC" ]; then
 	LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
 fi
 
@@ -341,6 +365,10 @@
 	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=''