[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.7 and 1.9

version 1.7, 2008/10/11 23:19:52 version 1.9, 2008/10/31 02:36:33
Line 1 
Line 1 
 #!/bin/sh  #!/bin/sh
 # $RedRiver: update_openbsd,v 1.6 2008/10/11 22:14:25 andrew Exp $  # $RedRiver: update_openbsd,v 1.8 2008/10/13 18:31:49 andrew Exp $
   
 if [ -e /etc/update_openbsd.conf ]; then  if [ -e /etc/update_openbsd.conf ]; then
     . /etc/update_openbsd.conf      . /etc/update_openbsd.conf
Line 53 
Line 53 
   
     local _cv=`echo $CUR_VER | sed -e 's/\.//'`      local _cv=`echo $CUR_VER | sed -e 's/\.//'`
     local _nv=`echo $NEW_VER | sed -e 's/\.//'`      local _nv=`echo $NEW_VER | sed -e 's/\.//'`
     local _v=""      local _v
   
     if [ X"" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then      if [ X"" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then
         _dir=$FORCE_DIR          _dir=$FORCE_DIR
Line 86 
Line 86 
             _dir=${FORCE_DIR}              _dir=${FORCE_DIR}
         fi          fi
         FTP=${MIRROR}/${_dir}/`machine`          FTP=${MIRROR}/${_dir}/`machine`
           local _proto=${FTP%%://*}
   
         local _file=`echo "ls base${_cv}.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'`          if [ X"ftp" == X"${_proto}" ]; then
               _file=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'`
           elif [ X"http" == X"${_proto}" ]; then
               _file=`${FTP_CMD} -V -o - ${FTP}/ | grep '"base[0-9][0-9].tgz' | sed -e 's/.*\(base..\.tgz\).*/\1/'`
           else
               echo Unsupported FTP ${FTP} >&2
               exit 2
           fi
   
         if [ X"base${_cv}.tgz" == X"${_file}" ]; then          _v=${_file##base}
           _v=${_v%%.tgz}
   
           if [ X"${_cv}" == X"${_v}" ]; then
             NEW_VER=$CUR_VER              NEW_VER=$CUR_VER
             _v=$_cv          elif [ X"${_nv}" == X"${_v}" ]; then
               NEW_VER=$NEW_VER
         else          else
             _v=$_nv              echo Invalid version $_v >&2
               exit 2
         fi          fi
   
         if [ X"" == X"$FORCE_DIR" ]; then          if [ X"" == X"$FORCE_DIR" ]; then
Line 110 
Line 123 
     if [ X"" == X"$RELEASEDIR" ]; then      if [ X"" == X"$RELEASEDIR" ]; then
         RELEASEDIR=`pwd`/$_dir          RELEASEDIR=`pwd`/$_dir
     fi      fi
   
     FILE_VER=$_v      FILE_VER=$_v
     FTP=${MIRROR}/${_dir}/`machine`      FTP=${MIRROR}/${_dir}/`machine`
 }  }
Line 324 
Line 338 
 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.7  
changed lines
  Added in v.1.9
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>