=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- openbsd/fw_update/fw_install.sh 2021/12/11 05:38:23 1.71 +++ openbsd/fw_update/fw_install.sh 2021/12/11 20:33:50 1.72 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.71 2021/12/11 05:38:23 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.72 2021/12/11 20:33:50 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -234,13 +234,17 @@ done fi - if [ ! -e "$f" ]; then - "$INSTALL" && ! "$DOWNLOAD" && - echo "Cannot install ${f##*/}, not found" >&2 && continue + if [ -e "$f" ]; then + if "$DOWNLOAD"; then + echo "Verify existing ${f##*/}" + verify "$f" || continue + # else assume it was verified when downloaded + fi + elif "$INSTALL" && ! "$DOWNLOAD"; then + echo "Cannot install ${f##*/}, not found" >&2 + continue + else fetch "$f" || continue - verify "$f" || continue - elif $DOWNLOAD; then - echo "Already have $f" verify "$f" || continue fi