[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.101 and 1.104

version 1.101, 2021/12/22 04:30:07 version 1.104, 2021/12/22 04:56:05
Line 244 
Line 244 
         DOWNLOAD=false          DOWNLOAD=false
         LOCALSRC=.          LOCALSRC=.
 else  else
         LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"          LOCALSRC="$( tmpdir "${DESTDIR}/tmp/${0##*/}" )"
 fi  fi
   
 CFILE="$LOCALSRC/$CFILE"  CFILE="$LOCALSRC/$CFILE"
   
 if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then  if "$INSTALL" && [ -x /usr/bin/id ] && [ "$(/usr/bin/id -u)" != 0 ]; then
         echo "need root privileges" >&2          echo "need root privileges" >&2
         exit 1          exit 1
 fi  fi
Line 271 
Line 271 
             echo "Signature check of SHA256.sig failed" >&2 && exit 1              echo "Signature check of SHA256.sig failed" >&2 && exit 1
 fi  fi
   
   added=''
   updated=''
 for f in "${devices[@]}"; do  for f in "${devices[@]}"; do
         d="$( firmware_devicename "$f" )"          d="$( firmware_devicename "$f" )"
   
Line 310 
Line 312 
   
         "$INSTALL" || continue          "$INSTALL" || continue
   
           removed=false
         if [ "${installed[*]:-}" ]; then          if [ "${installed[*]:-}" ]; then
                 for i in "${installed[@]}"; do                  for i in "${installed[@]}"; do
                         delete_firmware "$i"                          delete_firmware "$i"
                           removed=true
                 done                  done
         fi          fi
   
         add_firmware "$f"          add_firmware "$f"
   
           if "$removed"; then
                   [ "$updated" ] && updated="$updated,"
                   updated="$updated$d"
           else
                   [ "$added" ] && added="$added,"
                   added="$added$d"
           fi
 done  done
   
   if ! $VERBOSE && { [ "$added" ] || [ "$updated" ]; }; then
           echo  "${0##*/}: $(
               [ "$added" ] && echo -n "added ${added}"
               [ "$added" ] && [ "$updated" ] && echo -n "; "
               [ "$updated" ] && echo -n "updated ${updated}"
           )"
   fi
Legend:
Removed from v.1.101  
changed lines
  Added in v.1.104
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>