===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.13
retrieving revision 1.18
diff -u -r1.13 -r1.18
--- openbsd/update_openbsd/update_openbsd	2008/11/19 22:35:56	1.13
+++ openbsd/update_openbsd/update_openbsd	2009/01/14 18:13:23	1.18
@@ -1,22 +1,6 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.12 2008/11/12 06:07:42 andrew Exp $
+# $RedRiver: update_openbsd,v 1.17 2009/01/14 17:58:40 andrew Exp $
 
-if [ -e /etc/update_openbsd.conf ]; then
-    . /etc/update_openbsd.conf
-fi
-
-if [ -e ${HOME}/.update_openbsdrc ]; then
-    . ${HOME}/.update_openbsdrc
-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}
-FORCE_DIR=${FORCE_DIR:=No}
-
 installed_sets() {
     local misc=/usr/share/doc/README
     local man=/usr/share/man/cat1/intro.0
@@ -40,19 +24,36 @@
         fi
     done
 }
-INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
-sets_exist () {
+version_in() {
         local _proto=${FTP%%://*}
+        local _file
 
         if [ X"ftp" == X"${_proto}" ]; then
-            echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/ | awk '{ print $9 }'
+            local _list=`echo "ls base*.tgz" | ${FTP_CMD} ${FTP}/`
+            _file=`echo ${_list} | awk '/base[0-9][0-9].tgz/ { print $9 }'`
+
         elif [ X"http" == X"${_proto}" ]; then
-            ${FTP_CMD} -V -o - ${FTP}/ | grep '"base[0-9][0-9].tgz' | sed -e 's/.*\(base..\.tgz\).*/\1/'
+            local _list=`${FTP_CMD} -V -o - ${FTP}/`
+            _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { 
+                    sub("^.*base","base");
+                    sub("\.tgz.*",".tgz"); 
+                    print $0;
+                }'`
+
+        elif [ X"scp" == X"${_proto}" ]; then
+            echo SCP is not yet supported >&2
+            return 2
+
         else 
             echo Unsupported FTP ${FTP} >&2
             return 2
+
         fi
+
+        local _v=${_file##*base}
+        _v=${_v%.tgz*}
+        echo $_v
 }
 
 set_version() {
@@ -89,7 +90,7 @@
 
     fi
 
-    if [ X"" == X"${_v}" ]; then
+    if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
         if [ X"No" == X"${FORCE_DIR}" ]; then
             _dir=${NEW_VER}
         else
@@ -97,9 +98,9 @@
         fi
         FTP=${MIRROR}/${_dir}/`machine`
 
-        _file=`sets_exist`
+        _v=`version_in`
 
-        if [ X"" == X"${_file}" ]; then
+        if [ X"" == X"${_v}" ]; then
             if [ X"No" != X"$FORCE_DIR" ]; then
                 echo No sets in forced [${FTP}] >&2
                 return 2
@@ -109,18 +110,11 @@
             _dir=${NEW_VER}
             FTP=${MIRROR}/${_dir}/`machine`
 
-            _file=`sets_exist`
-            if [ X"" == X"${_file}" ]; then
-                echo No sets in [${FTP}] >&2
-                return 2
-            fi
+            _v=`version_in`
         fi
 
-        _v=${_file##*base}
-        _v=${_v%.tgz*}
-
         if [ X"" == X"${_v}" ]; then
-            echo No version in file [$_file] >&2
+            echo No sets in [${FTP}] >&2
             return 2 
         elif [ X"${_cv}" == X"${_v}" ]; then
             NEW_VER=$CUR_VER
@@ -147,7 +141,9 @@
     fi
 
     FILE_VER=$_v
-    FTP=${MIRROR}/${_dir}/`machine`
+    if [ X"" != X"${MIRROR}" ]; then
+        FTP=${MIRROR}/${_dir}/`machine`
+    fi
 }
 
 get_sets() {
@@ -180,7 +176,17 @@
         echo $FTP_CMD ${FTP}/MD5
         $FTP_CMD ${FTP}/MD5
     fi
+}
 
+check_md5() {
+    echo '### CHECKING MD5 ###'
+    cd $RELEASEDIR
+
+    if [ ! -e MD5 ]; then
+        echo MD5 File does not exist!
+        return 1
+    fi
+
     ls bsd* *.tgz | sed -e 's/\(.*\)/(\1)/' > index 
     grep -f index MD5 | md5 -c
 
@@ -190,6 +196,40 @@
     fi
 }
 
+check_sets() {
+    echo '### CHECKING SETS ###'
+    cd $RELEASEDIR
+
+    local _missing_sets
+    local _v=$FILE_VER
+
+    for _b in `echo /bsd* bsd bsd.mp bsd.rd | sort -u`; do
+	_b=${_b#/}
+        local _n=$_b
+        if [ X"bsd.sp" == X"${_n}" ]; then
+            _n=bsd
+        fi
+        if [ -e /${_b} -a ! -e ./${_n} ]; then
+            echo ${_n} does not exist
+            _missing_sets=1
+        fi
+    done
+
+    for _s in $INSTALLED_SETS; do
+        if [ ! -e ./${_s}${_v}.tgz ]; then
+            echo ${_s}${_v}.tgz does not exist
+            _missing_sets=1
+        fi
+    done
+
+    if [ X"" == X"${_missing_sets}" ]; then
+        echo All OK
+    fi
+
+    check_md5
+}
+
+
 install_kernel() {
     echo '### INSTALLING KERNEL ###'
     if [ X"$USER" != X"root" -a X"$SUDO" == X"" ]; then
@@ -359,6 +399,24 @@
     fi
 }
 
+if [ -e /etc/update_openbsd.conf ]; then
+    . /etc/update_openbsd.conf
+fi
+
+if [ -e ${HOME}/.update_openbsdrc ]; then
+    . ${HOME}/.update_openbsdrc
+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}
+FORCE_DIR=${FORCE_DIR:=No}
+
+INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
+
 set_version
 local _error=$?
 
@@ -382,7 +440,11 @@
 	exit ${_error}
 fi
 
-get_sets
+if [ X"" != X"${FTP}" ]; then
+    get_sets || exit
+fi
+
+check_sets || exit
 
 if [ X"" != X"$SUDO" ]; then
     echo Please enter your sudo password if prompted.