=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.138 retrieving revision 1.143 diff -u -r1.138 -r1.143 --- openbsd/fw_update/fw_install.sh 2021/12/26 18:58:54 1.138 +++ openbsd/fw_update/fw_install.sh 2022/01/07 01:47:24 1.143 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.138 2021/12/26 18:58:54 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.143 2022/01/07 01:47:24 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -37,7 +37,7 @@ DRYRUN=false VERBOSE=0 DELETE=false -DOWNLOAD=true +DOWNLOAD= INSTALL=true LOCALSRC= @@ -199,7 +199,7 @@ } add_firmware () { - local _f="${1##*/}" _pkgname + local _f="${1##*/}" _m="${2:-Install}" _pkgname FWPKGTMP="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )" local _flags=-vm case "$VERBOSE" in @@ -207,9 +207,7 @@ 2|3) _flags=-Vm ;; esac - [ "$VERBOSE" -eq 1 ] && echo -n "Install ${_f} ..." - - ftp -N "${0##/}" -D "Install" "$_flags" -o- "file:${1}" | + ftp -N "${0##/}" -D "$_m" "$_flags" -o- "file:${1}" | tar -s ",^\+,${FWPKGTMP}/+," \ -s ",^firmware,${DESTDIR}/etc/firmware," \ -C / -zxphf - "+*" "firmware/*" @@ -235,15 +233,13 @@ chmod 755 "$FWPKGTMP" mv "$FWPKGTMP" "${DESTDIR}/var/db/pkg/${_pkgname}" unset FWPKGTMP - - [ "$VERBOSE" -eq 1 ] && echo " done." } delete_firmware() { local _cwd _pkg="$1" _pkgdir="${DESTDIR}/var/db/pkg" # TODO: Check hash for files before deleting - [ "$VERBOSE" -gt 0 ] && echo -n "Uninstall $_pkg ..." + [ "$VERBOSE" -gt 2 ] && echo -n "Uninstall $_pkg ..." _cwd="${_pkgdir}/$_pkg" if [ ! -e "$_cwd/+CONTENTS" ] || @@ -279,7 +275,9 @@ fi done - [ "$VERBOSE" -gt 0 ] && echo " done." + [ "$VERBOSE" -gt 2 ] && echo " done." + + return 0 } usage() { @@ -288,13 +286,13 @@ } ALL=false -OPT_D= -while getopts :adDnp:v name +OPT_F= +while getopts :adFnp:v name do case "$name" in a) ALL=true ;; d) DELETE=true ;; - D) OPT_D=true ;; + F) OPT_F=true ;; n) DRYRUN=true ;; p) LOCALSRC="$OPTARG" ;; v) VERBOSE=$(( VERBOSE + 1 )) ;; @@ -323,7 +321,8 @@ fi # "Download only" means local dir and don't install -if [ "$OPT_D" ]; then +if [ "$OPT_F" ]; then + DOWNLOAD=true INSTALL=false LOCALSRC="${LOCALSRC:-.}" elif [ "$LOCALSRC" ]; then @@ -338,8 +337,11 @@ set -sA devices -- "$@" if "$DELETE"; then - [ "$OPT_D" ] && usage 22 + [ "$OPT_F" ] && usage 22 + # Show the "Uninstalling" message when just deleting not upgrading + [ "$VERBOSE" -gt 0 ] && VERBOSE=3 + set -A installed if [ "${devices[*]:-}" ]; then "$ALL" && usage 22 @@ -375,7 +377,7 @@ done fi - deleted="${deleted:+${deleted#,}}" + deleted="${deleted#,}" echo "${0:##*/}: deleted ${deleted:-none}"; exit @@ -386,31 +388,48 @@ REMOVE_LOCALSRC=true fi -CFILE="$LOCALSRC/$CFILE" - if [ "${devices[*]:-}" ]; then "$ALL" && usage 22 else - [ "$VERBOSE" -gt 0 ] && echo -n "Detect firmware ..." + [ "$VERBOSE" -gt 1 ] && echo -n "Detect firmware ..." set -sA devices -- $( detect_firmware ) - [ "$VERBOSE" -gt 0 ] && + [ "$VERBOSE" -gt 1 ] && { [ "${devices[*]:-}" ] && echo " found." || echo " done." ; } fi [ "${devices[*]:-}" ] || exit -if "$DOWNLOAD"; then - set +o noclobber # we want to get the latest CFILE - fetch "$CFILE" - 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 +# Only need the CFILE to verify what has been downloaded +# or to convert a device to a filename. +NEED_CFILE="${DOWNLOAD:-false}" +if ! "$NEED_CFILE"; then + for f in "${devices[@]}"; do + if [ "$( firmware_devicename "$f" )" = "$f" ]; then + NEED_CFILE=true + break + fi + done fi +# Only need to download if we already decided we did, +# or the same decision as if we NEED_CFILE. +DOWNLOAD="${DOWNLOAD:-$NEED_CFILE}" + +if "$NEED_CFILE"; then + CFILE="$LOCALSRC/$CFILE" + + if "$DOWNLOAD"; then + set +o noclobber # we want to get the latest CFILE + fetch "$CFILE" + 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 + echo "${0##*/}: $CFILE: No such file or directory" >&2 + exit 2 + fi +fi + added='' updated='' kept='' @@ -431,7 +450,7 @@ if "$INSTALL" && [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do if [ "${f##*/}" = "$i.tgz" ]; then - [ "$VERBOSE" -gt 0 ] && echo "Keep $i" + [ "$VERBOSE" -gt 2 ] && echo "Keep $i" kept="$kept,$d" continue 2 fi @@ -440,7 +459,7 @@ if [ -e "$f" ]; then if "$DOWNLOAD"; then - [ "$VERBOSE" -gt 0 ] && ! "$INSTALL" && + [ "$VERBOSE" -gt 1 ] && ! "$INSTALL" && echo "Keep/Verify ${f##*/}" "$DRYRUN" || verify "$f" || continue "$INSTALL" || kept="$kept,$d" @@ -454,7 +473,7 @@ fetch "$f" && verify "$f" || { [ "$VERBOSE" -eq 1 ] && echo " failed."; continue; } - [ "$VERBOSE" -eq 1 ] && echo " done." + [ "$VERBOSE" -eq 1 ] && ! "$INSTALL" && echo " done." fi "$INSTALL" || added="$added,$d" elif "$INSTALL"; then @@ -464,23 +483,35 @@ "$INSTALL" || continue - removed=false + update='' if [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do "$DRYRUN" || delete_firmware "$i" - removed=true + update="Update" done fi - "$DRYRUN" || add_firmware "$f" + "$DRYRUN" || add_firmware "$f" "$update" f="${f##*/}" f="${f%.tgz}" - if "$removed"; then - "$DRYRUN" && [ "$VERBOSE" -gt 0 ] && echo "Update $f" + if [ "$update" ]; then + if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then + echo " updated." + elif [ "$VERBOSE" -eq 1 ]; then + echo "Update $f" + elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then + echo "Update $f" + fi updated="$updated,$d" else - "$DRYRUN" && [ "$VERBOSE" -gt 0 ] && echo "Install $f" + if [ "$VERBOSE" -eq 1 ] && "$DOWNLOAD" && ! "$DRYRUN"; then + echo " installed." + elif [ "$VERBOSE" -eq 1 ]; then + echo "Install $f" + elif [ "$VERBOSE" -gt 0 ] && "$DRYRUN"; then + echo "Install $f" + fi added="$added,$d" fi done