=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.74 retrieving revision 1.77 diff -u -r1.74 -r1.77 --- openbsd/fw_update/fw_install.sh 2021/12/11 20:57:51 1.74 +++ openbsd/fw_update/fw_install.sh 2021/12/11 21:13:34 1.77 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.74 2021/12/11 20:57:51 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.77 2021/12/11 21:13:34 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -16,6 +16,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. set -o errexit -o pipefail -o nounset +export PATH=/usr/bin:/bin:/usr/sbin:/sbin CFILE=SHA256.sig DESTDIR=${DESTDIR:-} @@ -219,7 +220,7 @@ f=$( firmware_filename "$d" || true ) [ "$f" ] || continue f="$LOCALSRC/$f" - elif ! "$INSTALL" && ! grep -q "($f)" "$CFILE" ; then + elif ! "$INSTALL" && ! grep -Fq "($f)" "$CFILE" ; then echo "Cannot download local file $f" >&2 exit 2 fi @@ -241,12 +242,12 @@ verify "$f" || continue # else assume it was verified when downloaded fi - elif "$INSTALL" && ! "$DOWNLOAD"; then - echo "Cannot install ${f##*/}, not found" >&2 - continue - else + elif "$DOWNLOAD"; then fetch "$f" || continue verify "$f" || continue + elif "$INSTALL"; then + echo "Cannot install ${f##*/}, not found" >&2 + continue fi "$INSTALL" || continue