[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.92 and 1.95

version 1.92, 2021/12/19 20:22:49 version 1.95, 2021/12/21 02:16:47
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 148 
Line 148 
 }  }
   
 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" ] || continue
                 echo "${fw##*/}"                  echo "${fw##*/}"
         done          done
           set -o noglob
 }  }
   
 add_firmware () {  add_firmware () {
Line 199 
Line 201 
                 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 207 
Line 211 
 }  }
   
 usage() {  usage() {
         echo "usage: fw_install [-D | -L] [driver | file ...]"          echo "usage:  ${0##*/} [-D | -L] [driver | file ...]"
         exit 2          exit 2
 }  }
   
Line 238 
Line 242 
 fi  fi
   
 CFILE="$LOCALSRC/$CFILE"  CFILE="$LOCALSRC/$CFILE"
   
   if "$INSTALL" && [ -x /usr/bin/id ] && [ $(/usr/bin/id -u) != 0 ]; then
           echo "need root privileges" >&2
           exit 1
   fi
   
 set -A devices -- "$@"  set -A devices -- "$@"
   
Legend:
Removed from v.1.92  
changed lines
  Added in v.1.95
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>