[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.87 and 1.93

version 1.87, 2017/11/28 02:52:31 version 1.93, 2017/11/28 03:54:31
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $AFresh1: update_openbsd,v 1.86 2017/03/01 03:22:51 andrew Exp $  # $AFresh1: update_openbsd,v 1.92 2017/11/28 03:29:59 andrew Exp $
 #  #
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>  # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #  #
Line 118 
Line 118 
     fi      fi
   
     if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then      if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
         if [ X"No" == X"${FORCE_DIR}" ]; then          if [ X"No" != X"${FORCE_DIR}" ]; then
             _dir=${NEW_VER}  
         else  
             _dir=${FORCE_DIR}              _dir=${FORCE_DIR}
           elif sysctl kern.version | grep -q -- '-current '; then
               _dir=snapshots
               FORCE_DIR=snapshots
           else
               _dir=${NEW_VER}
         fi          fi
         FTP=${MIRROR}/${_dir}/`machine`          FTP=${MIRROR}/${_dir}/`machine`
   
Line 511 
Line 514 
     . ${HOME}/.update_openbsdrc      . ${HOME}/.update_openbsdrc
 fi  fi
   
 #MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD}  MIRROR=${MIRROR:=http://fastly.cdn.openbsd.org/pub/OpenBSD}
 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`/}  
   
 DESTDIR=${DESTDIR:=/}  DESTDIR=${DESTDIR:=/}
 SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}  SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
Line 523 
Line 525 
   
 set_version  set_version
   
   PKG_PATH=${PKG_PATH:=${MIRROR}/${FORCE_DIR:=$NEW_VER}/packages/`machine -a`/}
   TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all/}
   
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}  INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
   
 CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}  CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
Line 534 
Line 539 
 echo "------------------------------------------------------"  echo "------------------------------------------------------"
 echo  echo
 echo "        SYSMERGE: $SYSMERGE"  echo "        SYSMERGE: $SYSMERGE"
 echo "          MIRROR: $MIRROR"  echo "          MIRROR: $FTP"
 echo "        PKG_PATH: $PKG_PATH"  echo "        PKG_PATH: $PKG_PATH"
 echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"  echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
 echo "      RELEASEDIR: $RELEASEDIR"  echo "      RELEASEDIR: $RELEASEDIR"
Legend:
Removed from v.1.87  
changed lines
  Added in v.1.93
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>