[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.19 and 1.20

version 1.19, 2009/03/14 02:09:23 version 1.20, 2009/04/25 01:14:12
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $RedRiver: update_openbsd,v 1.18 2009/01/14 18:13:23 andrew Exp $  # $RedRiver: update_openbsd,v 1.19 2009/03/14 01:09:23 andrew Exp $
   
 installed_sets() {  installed_sets() {
     local misc=/usr/share/doc/README      local misc=/usr/share/doc/README
Line 182 
Line 182 
         fi          fi
     done      done
   
     if [ ! -e MD5 ]; then      local _type
         echo $FTP_CMD ${FTP}/MD5      for _type in $CHECKSUM_TYPES; do
         $FTP_CMD ${FTP}/MD5          if [ ! -e $_type ]; then
     fi              echo $FTP_CMD ${FTP}/$_type
               $FTP_CMD ${FTP}/$_type
           fi
       done
 }  }
   
 check_md5() {  check_sum () {
     echo '### CHECKING MD5 ###'      local _type=$1
       echo "### CHECKING $_type SUMS ###"
     cd $RELEASEDIR      cd $RELEASEDIR
   
     if [ ! -e MD5 ]; then      if [ ! -e $_type ]; then
         echo MD5 File does not exist!          echo $_type File does not exist!
         return 1          return 1
     fi      fi
   
     ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index      ls bsd* *gz | sed -e 's/\(.*\)/(\1)/' > index
     grep -f index MD5 | md5 -c      grep -f index $_type | sum -c
   
     if [ $? -ne 0 ]; then      if [ $? -ne 0 ]; then
         echo ERROR: MD5 does not match! >&2          echo ERROR: $_type does not match! >&2
         return 1          return 1
     fi      fi
 }  }
Line 240 
Line 244 
         echo All OK          echo All OK
     fi      fi
   
     check_md5      local _type
       for _type in $CHECKSUM_TYPES; do
           if [ -e $_type ]; then
               check_sum $_type
           fi
       done
 }  }
   
   
Line 425 
Line 434 
     fi      fi
 }  }
   
   
 if [ -e /etc/update_openbsd.conf ]; then  if [ -e /etc/update_openbsd.conf ]; then
     . /etc/update_openbsd.conf      . /etc/update_openbsd.conf
 fi  fi
Line 443 
Line 453 
   
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}  INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
   
   CHECKSUM_TYPES=${CHECKSUM_TYPE:=SHA256 MD5}
   
 set_version  set_version
 local _error=$?  local _error=$?
   
Line 467 
Line 479 
 fi  fi
   
 if [ X"" != X"${FTP}" ]; then  if [ X"" != X"${FTP}" ]; then
     get_sets || exit      get_sets
 fi  fi
   
 check_sets || exit  check_sets || exit
Legend:
Removed from v.1.19  
changed lines
  Added in v.1.20
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>