=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.63 retrieving revision 1.64 diff -u -r1.63 -r1.64 --- openbsd/fw_update/fw_install.sh 2021/12/09 02:23:15 1.63 +++ openbsd/fw_update/fw_install.sh 2021/12/09 02:37:38 1.64 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.63 2021/12/09 02:23:15 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.64 2021/12/09 02:37:38 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -182,20 +182,27 @@ } usage() { - echo "Usage: fw_install [ -d dir ] [ driver | file [ ... ] ]" + echo "Usage: fw_install [ -d dir | -L dir ] [ driver | file [ ... ] ]" exit 2 } DOWNLOADDIR= -while getopts d: name +LOCALDIR= +while getopts d:L: name do case "$name" in d) DOWNLOADDIR=$OPTARG ;; + L) LOCALDIR=$OPTARG ;; ?) usage 2 ;; esac done shift $((OPTIND - 1)) +if [[ -n "${DOWNLOADDIR:-}" && -n "${LOCALDIR:-}" ]]; then + echo "Cannot use -d and -L" >&2 + usage 2 +fi + set -A devices -- "$@" [ "${devices[*]:-}" ] || @@ -228,14 +235,21 @@ echo "Unable to use $DOWNLOADDIR, make sure it is a directory" exit 2 fi +elif [ "$LOCALDIR" ]; then + if ! cd "$LOCALDIR"; then + echo "Unable to use $LOCALDIR, make sure it is a directory" + exit 2 + fi else TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" ) cd "$TMPDIR" fi -fetch "$CFILE" -! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" && - echo "Signature check of SHA256.sig failed" >&2 && exit 1 +if ! [[ -n "$LOCALDIR" && -e "$CFILE" ]]; then + fetch "$CFILE" + ! signify -qVep "$FWPUB_KEY" -x "$CFILE" -m "$CFILE" && + echo "Signature check of SHA256.sig failed" >&2 && exit 1 +fi for d in "${devices[@]}"; do f="${d##*:}" @@ -258,6 +272,7 @@ fi if [ ! -e "$f" ]; then + [ "$LOCALDIR" ] && echo "Cannot install $f, not found" >&2 && continue fetch "$f" || continue verify "$f" || continue elif [ "${DOWNLOADDIR:-}" ]; then