[BACK]Return to fw_install.sh CVS log [TXT][DIR] Up to [local] / openbsd / fw_update

Diff for /openbsd/fw_update/fw_install.sh between version 1.109 and 1.110

version 1.109, 2021/12/23 19:32:59 version 1.110, 2021/12/23 19:48:55
Line 151 
Line 151 
 }  }
   
 installed_firmware() {  installed_firmware() {
         local _pattern="$1" _firmware          local _pre="$1" _match="$2" _post="$3" _firmware
         set -A _firmware -- $(          set -A _firmware -- $(
             set +o noglob              set +o noglob
             grep -Fxl '@option firmware' \              grep -Fxl '@option firmware' \
                 "${DESTDIR}/var/db/pkg/"$_pattern"/+CONTENTS" \                  "${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \
                 2>/dev/null || true                  2>/dev/null || true
             set -o noglob              set -o noglob
         )          )
Line 309 
Line 309 
                 exit 2                  exit 2
         fi          fi
   
         set -A installed -- $( installed_firmware "$d-firmware-*" )          set -A installed -- $( installed_firmware '' "$d-firmware-" '*' )
   
         if "$INSTALL" && [ "${installed[*]:-}" ]; then          if "$INSTALL" && [ "${installed[*]:-}" ]; then
                 for i in "${installed[@]}"; do                  for i in "${installed[@]}"; do

Legend:
Removed from v.1.109  
changed lines
  Added in v.1.110

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>