[BACK]Return to update_openbsd CVS log [TXT][DIR] Up to [local] / openbsd / update_openbsd

Diff for /openbsd/update_openbsd/update_openbsd between version 1.69 and 1.77

version 1.69, 2014/10/19 00:05:49 version 1.77, 2015/05/03 01:11:52
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.68 2014/10/18 22:42:35 andrew Exp $  # $AFresh1: update_openbsd,v 1.76 2015/05/02 23:27:53 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 27 
Line 27 
     local xserv=/usr/X11R6/bin/X      local xserv=/usr/X11R6/bin/X
     local xshare=/usr/X11R6/bin/startx      local xshare=/usr/X11R6/bin/startx
   
       local _nv=`echo $NEW_VER | sed -e 's/\.//'`
     local _c _d _e      local _c _d _e
     echo -n base      echo -n base
     echo -n ' etc'      [ $_nv -lt 57 ] && echo -n ' etc'
     for _d in misc man comp game xbase xetc xfont xserv xshare; do      for _d in misc man comp game xbase xetc xfont xserv xshare; do
           [ $_d = xetc -a $_nv -ge 57 ] && continue
         eval _e=\$${_d}          eval _e=\$${_d}
         _c=`ls $_e 2> /dev/null | wc -l`          _c=`ls $_e 2> /dev/null | wc -l`
         #echo $_c $_d $_e          #echo $_c $_d $_e
Line 222 
Line 224 
         if [ ! -e ./${_b} ]; then          if [ ! -e ./${_b} ]; then
             echo "===> $FTP_CMD ${FTP}/${_b}"              echo "===> $FTP_CMD ${FTP}/${_b}"
             $FTP_CMD ${FTP}/${_b}              $FTP_CMD ${FTP}/${_b}
           else
               echo "===> Have ${_b}"
         fi          fi
           kernel_file_version "${_b}"
     done      done
   
     for _s in $INSTALLED_SETS; do      for _s in $INSTALLED_SETS; do
           [ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue
         local _file=${_s}${_v}.tgz          local _file=${_s}${_v}.tgz
         if [ ${_s} == sendmail-smtp_auth ]; then          if [ ${_s} == sendmail-smtp_auth ]; then
             _file=${_s}.gz              _file=${_s}.gz
Line 251 
Line 257 
     local _file=$1      local _file=$1
     # This could go circular, but I dunno how to fix that.      # This could go circular, but I dunno how to fix that.
     if [ -h $_file ]; then      if [ -h $_file ]; then
         follow_symlink $( file $_file |          follow_symlink $( readlink -f $_file )
             grep 'symbolic link' |  
             sed -e s/^.*\\\`// -e s/\\\'\$// )  
     else      else
         echo $_file          echo $_file
     fi      fi
Line 288 
Line 292 
         fi          fi
         signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -c -          signify -V -e -p $_keyfile -x $_type -m - | grep -f index | sha256 -c -
     else      else
        grep -f index $_type | sum -c         grep -f index $_type | sha256 -c
     fi      fi
   
     if [ $? -ne 0 ]; then      if [ $? -ne 0 ]; then
Line 323 
Line 327 
     fi      fi
   
     for _s in $INSTALLED_SETS; do      for _s in $INSTALLED_SETS; do
           [ "$_v" -ge "57" -a "$_s" != "${_s%etc}" ] && continue
         local _file=${_s}${_v}.tgz          local _file=${_s}${_v}.tgz
         if [ ${_s} == sendmail-smtp_auth ]; then          if [ ${_s} == sendmail-smtp_auth ]; then
             _file=${_s}.gz              _file=${_s}.gz
Line 339 
Line 344 
   
     local _type      local _type
     for _type in $CHECKSUM_TYPES; do      for _type in $CHECKSUM_TYPES; do
           [ -n "$NO_SIGNIFY" -a "$_type" != "${_type%.sig}" ] && continue
         if [ -e $_type ]; then          if [ -e $_type ]; then
             check_sum $_type && break              check_sum $_type && break
             [ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1              [ -z "$IGNORE_CHECKSUM_ERROR" ] && exit 1
Line 509 
Line 515 
 FTP_CMD=${FTP_CMD:=ftp -V}  FTP_CMD=${FTP_CMD:=ftp -V}
 PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}  PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
   
   set_version
   
 DESTDIR=${DESTDIR:=/}  DESTDIR=${DESTDIR:=/}
 SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}  SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
 FORCE_DIR=${FORCE_DIR:=No}  FORCE_DIR=${FORCE_DIR:=No}
Line 517 
Line 525 
   
 CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}  CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
   
 set_version  
 local _error=$?  local _error=$?
   
 echo  echo
Line 537 
Line 544 
 #echo "       FILE_VER: $FILE_VER"  #echo "       FILE_VER: $FILE_VER"
 echo  echo
   
   for k in $INSTALL_KERNELS; do
       if [ -e "/$k" ]; then
           echo "Existing $k"
           kernel_file_version "/$k"
       fi
   done
   
 if [ ${_error} -ne 0 ]; then  if [ ${_error} -ne 0 ]; then
         exit ${_error}          exit ${_error}
 fi  fi
Line 597 
Line 611 
     fi      fi
     update_etc      update_etc
   
     echo '==> UPDATING PACKAGES'      OPENUP=$( which openup )
     pkg_add -ui -F update -F updatedepends      if [ -n "$OPENUP" ]; then
           echo "==> UPDATING WITH $OPENUP"
           $OPENUP
       else
           echo '==> UPDATING PACKAGES'
           pkg_add -ui -F update -F updatedepends
       fi
   
       echo '==> UPDATING FIRMWARE'
       fw_update
   
 else  else
     echo Instructions for updating to the new version available from      echo Instructions for updating to the new version available from
Legend:
Removed from v.1.69  
changed lines
  Added in v.1.77
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>