[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.94 and 1.99

version 1.94, 2021/12/21 02:16:01 version 1.99, 2021/12/22 04:10:22
Line 15 
Line 15 
 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF  # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.  # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
   
 set -o errexit -o pipefail -o nounset  set -o errexit -o pipefail -o nounset -o noclobber -o noglob
 set +o monitor  set +o monitor
 export PATH=/usr/bin:/bin:/usr/sbin:/sbin  export PATH=/usr/bin:/bin:/usr/sbin:/sbin
   
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
   
   VERBOSE=false
 DOWNLOAD=true  DOWNLOAD=true
 INSTALL=true  INSTALL=true
 LOCALSRC=  LOCALSRC=
Line 71 
Line 72 
         ) & _pid=$!          ) & _pid=$!
         set +o monitor          set +o monitor
   
         trap "kill -TERM '-$_pid'; exit 1" EXIT INT QUIT ABRT TERM          trap "kill -TERM '-$_pid' 2>/dev/null; exit 1" EXIT INT QUIT ABRT TERM
   
         SECONDS=0          SECONDS=0
         _last=0          _last=0
Line 148 
Line 149 
 }  }
   
 installed_firmware() {  installed_firmware() {
           set +o noglob
         for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do          for fw in "${DESTDIR}/var/db/pkg/$1-firmware"*; do
                 [ -e "$fw" ] || continue                  [ -e "$fw/+CONTENTS" ] || continue
                 echo "${fw##*/}"                  echo "${fw##*/}"
         done          done
           set -o noglob
 }  }
   
 add_firmware () {  add_firmware () {
Line 199 
Line 202 
                 if [ -d "$_r" ]; then                  if [ -d "$_r" ]; then
                         # Try hard not to actually remove recursively                          # Try hard not to actually remove recursively
                         # without rmdir on the install media.                          # without rmdir on the install media.
                           set +o noglob
                         [ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"                          [ "$_r/*" = "$( echo "$_r"/* )" ] && rm -rf "$_r"
                           set -o noglob
                 else                  else
                         rm -f "$_r"                          rm -f "$_r"
                 fi                  fi
Line 213 
Line 218 
   
 OPT_D=  OPT_D=
 OPT_L=  OPT_L=
 while getopts DL name  while getopts :DL name
 do  do
        case "$name" in         case "$name" in
        D) OPT_D=true ;;         D) OPT_D=true ;;
        L) OPT_L=true ;;         L) OPT_L=true ;;
        ?) usage 2 ;;         v) VERBOSE=true ;;
          ?) echo "${0##*/}: unknown option -- -$OPTARG"; usage 2 ;;
        esac         esac
 done  done
 shift $((OPTIND - 1))  shift $((OPTIND - 1))
Legend:
Removed from v.1.94  
changed lines
  Added in v.1.99
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>