=================================================================== RCS file: /cvs/openbsd/fw_update/fw_install.sh,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- openbsd/fw_update/fw_install.sh 2021/12/09 02:37:38 1.64 +++ openbsd/fw_update/fw_install.sh 2021/12/09 02:51:25 1.65 @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: fw_install.sh,v 1.64 2021/12/09 02:37:38 afresh1 Exp $ +# $OpenBSD: fw_install.sh,v 1.65 2021/12/09 02:51:25 afresh1 Exp $ # # Copyright (c) 2021 Andrew Hewus Fresh # @@ -198,7 +198,7 @@ done shift $((OPTIND - 1)) -if [[ -n "${DOWNLOADDIR:-}" && -n "${LOCALDIR:-}" ]]; then +if [[ -n "$DOWNLOADDIR" && -n "$LOCALDIR" ]]; then echo "Cannot use -d and -L" >&2 usage 2 fi @@ -208,7 +208,7 @@ [ "${devices[*]:-}" ] || set -A devices -- $( devices_needing_firmware ) -if [ ! "${devices:-}" ]; then +if [ ! "${devices[*]:-}" ]; then echo "No devices found which need firmware files to be downloaded." exit fi @@ -221,7 +221,7 @@ d=$( firmware_devicename "$f" ) [ "$f" = "$d" ] && f="$( echo "$f"-firmware-*.tgz | sed '$!d' )" if [ -e "$f" ]; then - if [ "${DOWNLOADDIR:-}" ]; then + if [ "$DOWNLOADDIR" ]; then echo "Cannot download local file $f" >&2 exit 2 fi @@ -262,8 +262,8 @@ set -A installed -- $( installed_firmware "$d" ) - if [ ! "${DOWNLOADDIR:-}" ] && [ "${installed:-}" ]; then - for i in "${installed[@]:-}"; do + if [ ! "$DOWNLOADDIR" ] && [ "${installed[*]:-}" ]; then + for i in "${installed[@]}"; do if [ "${f##*/}" = "$i.tgz" ]; then echo "$i already installed" continue 2 @@ -275,14 +275,14 @@ [ "$LOCALDIR" ] && echo "Cannot install $f, not found" >&2 && continue fetch "$f" || continue verify "$f" || continue - elif [ "${DOWNLOADDIR:-}" ]; then + elif [ "$DOWNLOADDIR" ]; then echo "Already have $f" verify "$f" || continue fi - [ "${DOWNLOADDIR:-}" ] && continue + [ "$DOWNLOADDIR" ] && continue - if [ "${installed:-}" ]; then + if [ "${installed[*]:-}" ]; then for i in "${installed[@]}"; do delete_firmware "$i" done