[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.106 and 1.110

version 1.106, 2021/12/23 01:25:29 version 1.110, 2021/12/23 19:48:55
Line 151 
Line 151 
 }  }
   
 installed_firmware() {  installed_firmware() {
         set +o noglob          local _pre="$1" _match="$2" _post="$3" _firmware
         for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do          set -A _firmware -- $(
                 [ -e "$fw/+CONTENTS" ] || continue              set +o noglob
               grep -Fxl '@option firmware' \
                   "${DESTDIR}/var/db/pkg/"$_pre"$_match"$_post"/+CONTENTS" \
                   2>/dev/null || true
               set -o noglob
           )
   
           [ "${_firmware[*]:-}" ] || return 0
           for fw in "${_firmware[@]}"; do
                   fw="${fw%/+CONTENTS}"
                 echo "${fw##*/}"                  echo "${fw##*/}"
         done          done
         set -o noglob  
 }  }
   
 add_firmware () {  add_firmware () {
Line 197 
Line 205 
         "$VERBOSE" && echo "Uninstalling $_pkg"          "$VERBOSE" && echo "Uninstalling $_pkg"
         _cwd="${_pkgdir}/$_pkg"          _cwd="${_pkgdir}/$_pkg"
   
           if [ ! -e "$_cwd/+CONTENTS" ] ||
               ! grep -Fxq '@option firmware' "$_cwd/+CONTENTS"; then
                   echo "${0##*/}: $_pkg does not appear to be firmware" >&2
                   return 2
           fi
   
         set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"          set -A _remove -- "${_cwd}/+CONTENTS" "${_cwd}"
   
         while read -r c g; do          while read -r c g; do
Line 226 
Line 240 
 }  }
   
 usage() {  usage() {
         echo "usage:  ${0##*/} [-v] [-D | -L] [driver | file ...]"          echo "usage:  ${0##*/} [-D | -L] [-v] [driver | file ...]"
         exit 2          exit 2
 }  }
   
Line 295 
Line 309 
                 exit 2                  exit 2
         fi          fi
   
         set -A installed -- $( installed_firmware "$d" )          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.106  
changed lines
  Added in v.1.110
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>