[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.105 and 1.106

version 1.105, 2021/12/22 17:53:53 version 1.106, 2021/12/23 01:25:29
Line 160 
Line 160 
 }  }
   
 add_firmware () {  add_firmware () {
         local _f="${1##*/}"          local _f="${1##*/}" _pkgname
         local _pkgdir="${DESTDIR}/var/db/pkg/${_f%.tgz}"          local _tmpdir="$( tmpdir "${DESTDIR}/var/db/pkg/.firmware" )"
         local flags=-VM          local flags=-VM
         "$VERBOSE" && flags=-vm          "$VERBOSE" && flags=-vm
         ftp -D "Install" "$flags" -o- "file:${1}" |          ftp -D "Install" "$flags" -o- "file:${1}" |
                 tar -s ",^\+,${_pkgdir}/+," \                  tar -s ",^\+,${_tmpdir}/+," \
                     -s ",^firmware,${DESTDIR}/etc/firmware," \                      -s ",^firmware,${DESTDIR}/etc/firmware," \
                     -C / -zxphf - "+*" "firmware/*"                      -C / -zxphf - "+*" "firmware/*"
   
           _pkgname="$( sed -n '/^@name /{s///p;q;}' "${_tmpdir}/+CONTENTS" )"
           if [ ! "$_pkgname" ]; then
                   echo "Failed to extract name from $1, partial install" 2>&1
                   rm -rf "$_tmpdir"
                   return 1
           fi
   
         # TODO: Should we mark these so real fw_update can -Drepair?          # TODO: Should we mark these so real fw_update can -Drepair?
         ed -s "${_pkgdir}/+CONTENTS" <<EOL          ed -s "${_tmpdir}/+CONTENTS" <<EOL
 /^@comment pkgpath/ -1a  /^@comment pkgpath/ -1a
 @option manual-installation  @option manual-installation
 @option firmware  @option firmware
Line 178 
Line 185 
 .  .
 w  w
 EOL  EOL
   
           chmod 755 "$_tmpdir"
           mv "$_tmpdir" "${DESTDIR}/var/db/pkg/${_pkgname}"
 }  }
   
 delete_firmware() {  delete_firmware() {

Legend:
Removed from v.1.105  
changed lines
  Added in v.1.106

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