===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openbsd/update_openbsd/update_openbsd	2008/08/12 23:44:19	1.4
+++ openbsd/update_openbsd/update_openbsd	2008/10/11 23:12:33	1.5
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.3 2008/08/12 22:42:09 andrew Exp $
+# $RedRiver: update_openbsd,v 1.4 2008/08/12 22:44:19 andrew Exp $
 
 SYSMERGE=/usr/sbin/sysmerge
 MIRROR=ftp://ftp.openbsd.org/pub/OpenBSD
@@ -14,24 +14,25 @@
 fi
 
 installed_sets() {
-    misc=/usr/share/doc/README
-    man=/usr/share/man/cat1/intro.0
-    comp=/usr/bin/cc
-    game=/usr/games/
-    xbase=/usr/X11R6/
-    xetc=/etc/X11/xinit/xinitrc
-    xfont=/usr/X11R6/lib/X11/fonts
-    xserv=/usr/X11R6/bin/X
-    xshare=/usr/X11R6/bin/startx
+    local misc=/usr/share/doc/README
+    local man=/usr/share/man/cat1/intro.0
+    local comp=/usr/bin/cc
+    local game=/usr/games/
+    local xbase=/usr/X11R6/
+    local xetc=/etc/X11/xinit/xinitrc
+    local xfont=/usr/X11R6/lib/X11/fonts
+    local xserv=/usr/X11R6/bin/X
+    local xshare=/usr/X11R6/bin/startx
 
-    echo base
-    echo etc
+    local _c _d _e
+    echo -n base
+    echo -n ' etc'
     for _d in misc man comp game xbase xetc xfont xserv xshare; do
         eval _e=\$${_d}
         _c=`ls $_e 2> /dev/null | wc -l`
         #echo $_c $_d $_e
         if [ $_c -ne 0 ]; then
-            echo $_d
+            echo -n " $_d"
         fi
     done
 }
@@ -39,84 +40,96 @@
 set_version() {
     CUR_VER=`uname -r`
     NEW_VER=`dc -e "$CUR_VER 0.1 + p"`
+    FILE_VER=""
+    FTP=""
 
-    if [ -d $NEW_VER ]; then
-        DIR=$NEW_VER
-    fi
+    local _cv=`echo $CUR_VER | sed -e 's/\.//'`
+    local _nv=`echo $NEW_VER | sed -e 's/\.//'`
+    local _v=""
 
-    if [ -d $CUR_VER ]; then
+    if [ X"" != X"$FORCE_DIR" -a -d $FORCE_DIR ]; then
+        _dir=$FORCE_DIR
+        if [ -e ${_dir}/base${_nv}.tgz ]; then
+            _v=$_nv
+        elif [ -e ${_dir}/base${_cv}.tgz ]; then
+            NEW_VER=$CUR_VER
+            _v=$_cv
+        fi
+
+    elif [ -d $CUR_VER ]; then
+        _dir=$CUR_VER
         NEW_VER=$CUR_VER
-        DIR=$NEW_VER
-    fi
+        if [ -e ${_dir}/base${_cv}.tgz ]; then
+            _v=$_cv
+        fi
 
-    if [ X"" != X"$FORCE_DIR" ]; then
-        if [ -d $FORCE_DIR ]; then
-            DIR=$FORCE_DIR
-
-            _cv=`echo $CUR_VER | sed -e 's/\.//'`
-            if [ -e $DIR/base${_cv}.tgz ]; then
-                NEW_VER=$CUR_VER
-            fi
+    elif [ -d $NEW_VER ]; then
+        _dir=$NEW_VER
+        if [ -e ${_dir}/base${_nv}.tgz ]; then
+            _v=$_nv
         fi
+
     fi
 
-    if [ X"" == X"$DIR" ]; then
-        FTP=${MIRROR}/${NEW_VER}/`machine`
+    if [ X"" == X"${_v}" ]; then
+        if [ X"" == X"${FORCE_DIR}" ]; then
+            _dir=${NEW_VER}
+        else
+            _dir=${FORCE_DIR}
+        fi
+        FTP=${MIRROR}/${_dir}/`machine`
 
-        #echo "ls\nquit\n" | ftp $MIRROR | grep "$NEW_VER"
-        $FTP_CMD ${FTP}/MD5 > /dev/null
+        local _file=`echo "ls base${_cv}.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'`
 
-        if [ -e MD5 ]; then
-            rm -f MD5
-        else
+        if [ X"base${_cv}.tgz" == X"${_file}" ]; then
             NEW_VER=$CUR_VER
+            _v=$_cv
+        else
+            _v=$_nv
         fi
 
-        if [ X"$FORCE_DIR" == X"" ]; then
-            DIR=$NEW_VER
-        else
-            DIR=$FORCE_DIR
+        if [ X"" == X"$FORCE_DIR" ]; then
+            _dir=$NEW_VER
         fi
 
-        FTP=${MIRROR}/${DIR}/`machine`
     fi
 
-    if [ X"" != X"$RELEASEDIR" ]; then
-        DIR=$RELEASEDIR
+    if [ X"" == X"${_v}" ]; then
+        echo ERROR: Unable to determine file version! >&2
+        exit 1
     fi
 
-    if [ -d $DIR ]; then
-       cd $DIR
-       RELEASEDIR=`pwd`
+    if [ X"" == X"$RELEASEDIR" ]; then
+        RELEASEDIR=`pwd`/$_dir
     fi
-
-    _v=`echo $NEW_VER | sed -e 's/\.//'`
+    FILE_VER=$_v
+    FTP=${MIRROR}/${_dir}/`machine`
 }
 
 get_sets() {
+    echo '### GETTING SETS ###'
     if [ X"" == X"$FTP" ]; then
-        echo Error, no FTP site is set! >&2
+        echo ERROR: No FTP site set! >&2
         exit 1
     fi
 
-    if [ X"" == X"$RELEASEDIR" ]; then
-        RELEASEDIR=$DIR
-    fi
-
-    mkdir -p $RELEASEDIR
+    mkdir -p ${RELEASEDIR}
     cd $RELEASEDIR
-    RELEASEDIR=`pwd`
 
-    for _b in /bsd* bsd bsd.mp bsd.rd; do
+    local _v=$FILE_VER
+
+    for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do
         if [ -e /${_b} -a ! -e ./${_b} ]; then
             echo $FTP_CMD ${FTP}/${_b}
             $FTP_CMD ${FTP}/${_b}
         fi
     done
 
-    for _s in `installed_sets`; do
-        echo $FTP_CMD ${FTP}/${_s}${_v}.tgz
-        $FTP_CMD ${FTP}/${_s}${_v}.tgz
+    for _s in $INSTALLED_SETS; do
+        if [ ! -e ./${_s}${_v}.tgz ]; then
+            echo $FTP_CMD ${FTP}/${_s}${_v}.tgz
+            $FTP_CMD ${FTP}/${_s}${_v}.tgz
+        fi
     done
 
     echo $FTP_CMD ${FTP}/MD5
@@ -125,40 +138,41 @@
     grep -f index MD5 | md5 -c
 
     if [ $? -ne 0 ]; then
-        echo !!! WARNING: MD5 does not match !!! >&2
+        echo ERROR: MD5 does not match! >&2
         exit 1
     fi
 }
 
 install_kernel() {
+    echo '### INSTALLING KERNEL ###'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
     fi
 
     if [ X"" == X"$RELEASEDIR" ]; then
-        echo "ERROR: no source for new kernels!" >&2
+        echo ERROR: no source for new kernels! >&2
         exit 1
     else
         cd $RELEASEDIR
     fi
 
     if [ ! -e bsd ]; then
-        echo "new bsd kernel does not exist!" >&2
+        echo ERROR: new bsd kernel does not exist! >&2
         exit 1
     fi
 
     if [ -e /bsd.mp -a ! -e bsd.mp ]; then
-        echo "new bsd.mp kernel does not exist!" >&2
+        echo ERROR: new bsd.mp kernel does not exist! >&2
         exit 1
     fi
 
     if [ ! -e bsd.rd ]; then
-        echo "new bsd.rd kernel does not exist!" >&2
+        echo ERROR: new bsd.rd kernel does not exist! >&2
         exit 1
     fi
 
-
+    local _v=$FILE_VER
     if [ -e base${_v}.tgz ]; then
         echo Extracting new firmware from base${_v}.tgz
         $SUDO tar -C $DESTDIR -xzphf base${_v}.tgz "*etc/firmware/*"
@@ -174,11 +188,11 @@
     for _b in bsd*; do
         $SUDO rm -f /nbsd
 
-        if [ X"$_b" == X"bsd" ]; then
+        if [ X"${_b}" == X"bsd" ]; then
             echo Copying bsd to /bsd.sp
             $SUDO cp bsd /nbsd && $SUDO mv /nbsd /bsd.sp
             if [ $? -ne 0 ]; then
-                echo "ERROR: Couldn't copy new SP kernel!" >&2
+                echo ERROR: Could not copy new SP kernel! >&2
                 exit 1
             fi
         else
@@ -186,7 +200,7 @@
                 echo Copying $_b to /
                 $SUDO cp ${_b} /nbsd && $SUDO mv /nbsd /${_b}
                 if [ $? -ne 0 ]; then
-                    echo "ERROR: Couldn't copy new $_b kernel!" >&2
+                    echo ERROR: Could not copy new $_b kernel! >&2
                     exit 1
                 fi
             fi
@@ -202,25 +216,28 @@
             $SUDO ln -sf /bsd.sp /bsd
         fi
         if [ $? -ne 0 ]; then
-            echo "ERROR: Couldn't symlink new kernel!" >&2
+            echo ERROR: Could not symlink new kernel! >&2
             exit 1
         fi
     fi
 }
 
 install_sets() {
+    echo '### INSTALLING SETS ###'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
         echo ${0##*/} must be run as root or SUDO must be set! >&2
         exit 1
     fi
 
     if [ X"" == X"$RELEASEDIR" ]; then
-        echo "ERROR: no source for sets!" >&2
+        echo ERROR: no source for sets! >&2
         exit 1
     else
         cd $RELEASEDIR
     fi
 
+    local _v=$FILE_VER
+
     for _f in *${_v}.tgz; do
         _path=$DESTDIR
         if [ X"etc${_v}.tgz"  == X"$_f" \
@@ -235,7 +252,7 @@
         $SUDO mkdir -p $_path
         $SUDO tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then
-            echo "Error extracting ${_f}!" >&2
+            echo ERROR: Could not extract ${_f}! >&2
             exit 1
         fi
     done
@@ -244,12 +261,14 @@
 }
 
 update_etc() {
+    echo '### UPDATING ETC ###'
     if [ X"" == X"$SYSMERGE" ]; then
         if [ -e /var/tmp/temproot ]; then
             MERGEMASTER=`which mergemaster`
 
             if [ $? != 0 ]; then
                 $SUDO pkg_add -i mergemaster
+
                 MERGEMASTER=`which mergemaster`
                 if [ $? != 0 ]; then
                     echo ERROR: mergemaster not installed! >&2
@@ -271,12 +290,12 @@
             cd $RELEASEDIR
         fi
 
-        _cv=`echo $CUR_VER | sed -e 's/\.//'`
-        if [ -e etc${_cv}.tgz ]; then
-            _args="$_args -s etc${_cv}.tgz"
+        local _v=$FILE_VER
+        if [ -e etc${_v}.tgz ]; then
+            _args="$_args -s etc${_v}.tgz"
         fi
-        if [ -e xetc${_cv}.tgz ]; then
-            _args="$_args -x xetc${_cv}.tgz"
+        if [ -e xetc${_v}.tgz ]; then
+            _args="$_args -x xetc${_v}.tgz"
         fi
         if [ X"" == X"$_args" ]; then 
             echo ERROR: No upgrade sets found! >&2
@@ -290,6 +309,7 @@
 
 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
@@ -303,20 +323,18 @@
 echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"
 echo
-echo "       DIR: $DIR"
 echo "RELEASEDIR: $RELEASEDIR"
 echo "   DESTDIR: $DESTDIR"
 echo "   CUR_VER: $CUR_VER"
 echo "   NEW_VER: $NEW_VER"
+#echo "  FILE_VER: $FILE_VER"
 echo "      SUDO: $SUDO"
 echo "  SYSMERGE: $SYSMERGE"
 echo "    MIRROR: $MIRROR"
+echo "      SETS: $INSTALLED_SETS"
 echo
 
-if [ X"" == X"$RELEASEDIR" ]; then
-    echo '### GETTING SETS ###'
-    get_sets
-fi
+get_sets
 
 if [ X"" != X"$SUDO" ]; then
     echo Please enter your sudo password if prompted.
@@ -324,14 +342,10 @@
     $SUDO -v
 fi
 
-echo '### INSTALLING KERNEL ###'
 install_kernel
 
-if [ $CUR_VER == $NEW_VER -o X"" != X"$FORCE_DIR" ]; then
-    echo '### INSTALLING SETS ###'
+if [ $CUR_VER == $NEW_VER ]; then
     install_sets
-
-    echo '### UPDATING ETC ###'
     update_etc
 
     echo '### UPDATING PACKAGES ###'