[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.85 and 1.88

version 1.85, 2021/12/18 22:03:43 version 1.88, 2021/12/19 02:02:02
Line 34 
Line 34 
 FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}  FWURL=http://firmware.openbsd.org/firmware/${HTTP_FWDIR}
 FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub  FWPUB_KEY=${DESTDIR}/etc/signify/openbsd-${VERSION}-fw.pub
   
   DOWNLOAD=true
   INSTALL=true
 LOCALSRC=  LOCALSRC=
   
 tmpdir() {  tmpdir() {
Line 122 
Line 124 
                 set -A _dmesgtail                  set -A _dmesgtail
                 while read -r _line; do                  while read -r _line; do
                         _dmesgtail[$_m]="$_line"                          _dmesgtail[$_m]="$_line"
                         let _m=$_m+1                          _m=$(( _m + 1 ))
                 done                  done
   
                 grep -v '^[[:space:]]*#' "$FWPATTERNS" |                  grep -v '^[[:space:]]*#' "$FWPATTERNS" |
Line 219 
Line 221 
 }  }
   
 usage() {  usage() {
         echo "usage: fw_install [-DL] [driver | file [...]]"          echo "usage: fw_install [-D | -L] [driver | file ...]"
         exit 2          exit 2
 }  }
   
 INSTALL=true  OPT_D=
 DOWNLOAD=true  OPT_L=
   
 while getopts DL name  while getopts DL name
 do  do
        case "$name" in         case "$name" in
        # "download only" means local dir and don't install         D) OPT_D=true ;;
        D) LOCALSRC=. INSTALL=false ;;         L) OPT_L=true ;;
        L) LOCALSRC=. ;;  
        ?) usage 2 ;;         ?) usage 2 ;;
        esac         esac
 done  done
 shift $((OPTIND - 1))  shift $((OPTIND - 1))
   
 # If we're installing from a local dir  [ "$OPT_D" ] && [ "$OPT_L" ] && usage 1
 # we don't want to download anything  
 [ "$LOCALSRC" ] && "$INSTALL" && DOWNLOAD=false  if [ "$OPT_D" ]; then
 [ "$LOCALSRC" ] || LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"          # "Download only" means local dir and don't install
           INSTALL=false
           LOCALSRC=.
   elif [ "$OPT_L" ]; then
           # "Local" means don't download, install from local dir
           DOWNLOAD=false
           LOCALSRC=.
   else
           LOCALSRC="$( tmpdir "${DESTDIR}/tmp/fw_install" )"
   fi
   
 CFILE="$LOCALSRC/$CFILE"  CFILE="$LOCALSRC/$CFILE"
   
Legend:
Removed from v.1.85  
changed lines
  Added in v.1.88
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>