[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.59 and 1.60

version 1.59, 2021/12/09 02:08:03 version 1.60, 2021/12/09 02:09:52
Line 187 
Line 187 
 }  }
   
 usage() {  usage() {
         echo "Usage: fw_install [ driver | file [ ... ] ]"          echo "Usage: fw_install [ -d dir ] [ driver | file [ ... ] ]"
         exit 2          exit 2
 }  }
   
 while getopts '?' name  DOWNLOADDIR=
   while getopts d: name
 do  do
        case "$name" in         case "$name" in
          d) DOWNLOADDIR=$OPTARG ;;
        ?) usage 2 ;;         ?) usage 2 ;;
        esac         esac
 done  done
Line 217 
Line 219 
         d=$( firmware_devicename "$f" )          d=$( firmware_devicename "$f" )
         [ "$f" = "$d" ] && f="$( echo "$f"-firmware-*.tgz | sed '$!d' )"          [ "$f" = "$d" ] && f="$( echo "$f"-firmware-*.tgz | sed '$!d' )"
         if [ -e "$f" ]; then          if [ -e "$f" ]; then
                   if [ "${DOWNLOADDIR:-}" ]; then
                           echo "Cannot download local file $f" >&2
                           exit 2
                   fi
                 devices[$i]="$d:$( realpath "$f" )"                  devices[$i]="$d:$( realpath "$f" )"
         fi          fi
         i=$((i + 1))          i=$((i + 1))
 done  done
   
 TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )  if [ "$DOWNLOADDIR" ]; then
 cd "$TMPDIR"          if ! cd "$DOWNLOADDIR"; then
                   echo "Unable to use $DOWNLOADDIR, make sure it is a directory"
                   exit 2
           fi
   else
           TMPDIR=$( tmpdir "${DESTDIR}/tmp/fw_install" )
           cd "$TMPDIR"
   fi
   
 # To unpriv we need to let the unpriv user into this dir  # To unpriv we need to let the unpriv user into this dir
 chmod go+x .  chmod go+x .
Line 243 
Line 256 
   
         set -A installed -- $( installed_firmware "$d" )          set -A installed -- $( installed_firmware "$d" )
   
         if [ "${installed:-}" ]; then          if [ ! "${DOWNLOADDIR:-}" ] && [ "${installed:-}" ]; then
                 for i in "${installed[@]:-}"; do                  for i in "${installed[@]:-}"; do
                         if [ "${f##*/}" = "$i.tgz" ]; then                          if [ "${f##*/}" = "$i.tgz" ]; then
                                 echo "$i already installed"                                  echo "$i already installed"
Line 255 
Line 268 
         if [ ! -e "$f" ]; then          if [ ! -e "$f" ]; then
                 fetch  "$f" || continue                  fetch  "$f" || continue
                 verify "$f" || continue                  verify "$f" || continue
           elif [ "${DOWNLOADDIR:-}" ]; then
                   echo "Already have $f"
         fi          fi
   
           [ "${DOWNLOADDIR:-}" ] && continue
   
         if [ "${installed:-}" ]; then          if [ "${installed:-}" ]; then
                 for i in "${installed[@]}"; do                  for i in "${installed[@]}"; do
Legend:
Removed from v.1.59  
changed lines
  Added in v.1.60
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>