[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.6 and 1.8

version 1.6, 2008/10/11 23:14:25 version 1.8, 2008/10/13 19:31:49
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $RedRiver: update_openbsd,v 1.5 2008/10/11 22:12:33 andrew Exp $  # $RedRiver: update_openbsd,v 1.7 2008/10/11 22:19:52 andrew Exp $
   
 SYSMERGE=/usr/sbin/sysmerge  
 MIRROR=ftp://ftp.openbsd.org/pub/OpenBSD  
 FTP_CMD='ftp -V'  
   
 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 13 
Line 9 
     . ${HOME}/.update_openbsdrc      . ${HOME}/.update_openbsdrc
 fi  fi
   
   MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD}
   FTP_CMD=${FTP_CMD:=ftp -V}
   PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
   
   DESTDIR=${DESTDIR:=/}
   SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
   if [ ! -e $SYSMERGE ]; then
       SYSMERGE=
   fi
   
 installed_sets() {  installed_sets() {
     local misc=/usr/share/doc/README      local misc=/usr/share/doc/README
     local man=/usr/share/man/cat1/intro.0      local man=/usr/share/man/cat1/intro.0
Line 36 
Line 42 
         fi          fi
     done      done
 }  }
   INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
   
   
 set_version() {  set_version() {
     CUR_VER=`uname -r`      CUR_VER=`uname -r`
     NEW_VER=`dc -e "$CUR_VER 0.1 + p"`      NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
Line 310 
Line 318 
     fi      fi
 }  }
   
 DESTDIR=${DESTDIR:=/}  
 PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}  
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}  
   
 if [ X"" != X"$SYSMERGE" ]; then  
     if [ ! -e $SYSMERGE ]; then  
         SYSMERGE=  
     fi  
 fi  
   
 set_version  set_version
   
 echo  echo
 echo "-= update_openbsd - helper script to update OpenBSD =-"  echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"  echo "------------------------------------------------------"
 echo  echo
 echo "RELEASEDIR: $RELEASEDIR"  echo "          SUDO: $SUDO"
 echo "   DESTDIR: $DESTDIR"  echo "      SYSMERGE: $SYSMERGE"
 echo "   CUR_VER: $CUR_VER"  echo "        MIRROR: $MIRROR"
 echo "   NEW_VER: $NEW_VER"  echo "    RELEASEDIR: $RELEASEDIR"
 #echo "  FILE_VER: $FILE_VER"  echo "       DESTDIR: $DESTDIR"
 echo "      SUDO: $SUDO"  echo "INSTALLED_SETS: $INSTALLED_SETS"
 echo "  SYSMERGE: $SYSMERGE"  echo
 echo "    MIRROR: $MIRROR"  echo "       CUR_VER: $CUR_VER"
 echo "      SETS: $INSTALLED_SETS"  echo "       NEW_VER: $NEW_VER"
   #echo "      FILE_VER: $FILE_VER"
 echo  echo
   
 get_sets  get_sets
Legend:
Removed from v.1.6  
changed lines
  Added in v.1.8
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>