===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- openbsd/update_openbsd/update_openbsd	2008/11/19 23:02:38	1.15
+++ openbsd/update_openbsd/update_openbsd	2009/01/13 21:47:49	1.16
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $RedRiver: update_openbsd,v 1.14 2008/11/19 22:38:00 andrew Exp $
+# $RedRiver: update_openbsd,v 1.15 2008/11/19 23:02:38 andrew Exp $
 
 installed_sets() {
     local misc=/usr/share/doc/README
@@ -25,19 +25,21 @@
     done
 }
 
-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}/ | 
-                awk '/[^x]base[0-9][0-9]*\.tgz/ { 
+            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
@@ -48,6 +50,10 @@
             return 2
 
         fi
+
+        local _v=${_file##*base}
+        _v=${_v%.tgz*}
+        echo $_v
 }
 
 set_version() {
@@ -92,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
@@ -104,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