=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.121 retrieving revision 1.122 diff -u -r1.121 -r1.122 --- openbsd/fw_update/fw_install.sh 2021/12/24 02:27:46 1.121 +++ 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.121 2021/12/24 02:27:46 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.122 2021/12/24 02:36:13 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -241,20 +241,18 @@ } usage() { - echo "usage: ${0##*/} [-d | -D | -L] [-av] [-p path] [driver | file ...]" + echo "usage: ${0##*/} [-d | -D] [-av] [-p path] [driver | file ...]" exit 2 } ALL=false OPT_D= -OPT_L= -while getopts :adDLp:v 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 ;; :) @@ -269,36 +267,26 @@ 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 +# "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="${LOCALSRC:-.}" -elif [ "$OPT_L" ]; then - # "Local" means don't download, install from local dir - DOWNLOAD=false - LOCALSRC="${LOCALSRC:-.}" -elif [ ! "$LOCALSRC" ]; then - LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" fi +[ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )" + CFILE="$LOCALSRC/$CFILE" if [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then @@ -309,7 +297,7 @@ set -A devices -- "$@" if "$DELETE"; then - [ "$OPT_D" ] || [ "$OPT_L" ] && usage 22 + [ "$OPT_D" ] && usage 22 set -A installed if [ "${devices[*]:-}" ]; then