[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.16 and 1.19

version 1.16, 2021/10/18 00:18:02 version 1.19, 2021/10/21 02:02:52
Line 6 
Line 6 
         sed -n "$1" /var/run/dmesg.boot          sed -n "$1" /var/run/dmesg.boot
 }  }
   
 installed_firmware() {  
         for fw in ${PKGDIR}/$1-firmware*; do  
                 [ -e "$fw" ] || continue  
                 echo ${fw##*/}  
         done  
 }  
   
 # tmpdir, do_as, unpriv, and unpriv2 are from install.sub  # tmpdir, do_as, unpriv, and unpriv2 are from install.sub
   
 # Create a temporary directory based on the supplied directory name prefix.  # Create a temporary directory based on the supplied directory name prefix.
Line 135 
Line 128 
         # Cleanup from previous runs.          # Cleanup from previous runs.
         rm -f $_cfile $_cfile.sig          rm -f $_cfile $_cfile.sig
   
       _t=Get/Verify
   
         ! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&          ! $_unpriv ftp -D "$_t" -Vmo - "$_src/SHA256.sig" >"$_cfile.sig" &&
             _issue="Cannot fetch SHA256.sig" && fail              _issue="Cannot fetch SHA256.sig" && fail
   
Line 145 
Line 140 
   
         for _d in $_drivers; do          for _d in $_drivers; do
                 _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )                  _f=$( sed -n "s/.*(\($_d-firmware-.*\.tgz\)).*/\1/p" "$_cfile" )
                 _installed=$( installed_firmware "$_d" )                  _installed=$(
                   for fw in "${PKGDIR}/$_d-firmware"*; do
                           [ -e "$fw" ] || continue
                           echo ${fw##*/}
                   done
           )
   
                 for _i in $_installed; do                  for _i in $_installed; do
                         if [ "$_f" = "$_i.tgz" ]; then                          if [ "$_f" = "$_i.tgz" ]; then
Line 156 
Line 156 
   
                 rm -f /tmp/h /tmp/fail                  rm -f /tmp/h /tmp/fail
   
                 _t=Get/Verify  
                 # Fetch firmware file and create a checksum by piping through                  # Fetch firmware file and create a checksum by piping through
                 # sha256. Create a flag file in case ftp failed. Firmware                  # sha256. Create a flag file in case ftp failed. Firmware
                 # from net is written to the prefetch area.                  # from net is written to the prefetch area.
Line 182 
Line 181 
                 fi                  fi
   
                 # TODO: Check hash for files before deleting                  # TODO: Check hash for files before deleting
                 if [ "$installed" ] && [ -e "${PKGDIR}/$installed/+CONTENTS" ]; then                  if [ "$_installed" ] && [ -e "${PKGDIR}/$_installed/+CONTENTS" ]; then
                         echo "Uninstalling $installed"                          echo "Uninstalling $_installed"
                         cwd=${PKGDIR}/$installed                          cwd=${PKGDIR}/$_installed
   
                         set -A _remove -- "${cwd}/+CONTENTS" "${cwd}"                          set -A _remove -- "${cwd}/+CONTENTS" "${cwd}"
   
Line 197 
Line 196 
                                 *)  set -A _remove -- "$cwd/$c" "${_remove[@]}"                                  *)  set -A _remove -- "$cwd/$c" "${_remove[@]}"
                                   ;;                                    ;;
                                 esac                                  esac
                         done < "${PKGDIR}/$installed/+CONTENTS"                          done < "${PKGDIR}/$_installed/+CONTENTS"
   
                         for _r in "${_remove[@]}" ; do                          for _r in "${_remove[@]}" ; do
                                 if [ -d "$_r" ]; then                                  if [ -d "$_r" ]; then
Legend:
Removed from v.1.16  
changed lines
  Added in v.1.19
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>