===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.76
retrieving revision 1.80
diff -u -r1.76 -r1.80
--- openbsd/update_openbsd/update_openbsd	2015/05/03 00:27:53	1.76
+++ openbsd/update_openbsd/update_openbsd	2015/11/27 22:38:38	1.80
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.75 2015/05/02 23:27:01 andrew Exp $
+# $AFresh1: update_openbsd,v 1.79 2015/11/03 03:56:53 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -257,9 +257,7 @@
     local _file=$1
     # This could go circular, but I dunno how to fix that.
     if [ -h $_file ]; then
-        follow_symlink $( file $_file |
-            grep 'symbolic link' | 
-            sed -e s/^.*\\\`// -e s/\\\'\$// )
+        follow_symlink $( readlink -f $_file )
     else
         echo $_file
     fi
@@ -473,7 +471,7 @@
     local _v=$FILE_VER
     local _args=""
 
-    if [ ! -e /usr/share/sysmerge/etc.tgz ]; then
+    if [ ! -e /var/sysmerge/etc.tgz ]; then
         if [ X"" == X"$RELEASEDIR" ]; then
             echo "ERROR: no source for etc!" >&2
             exit 1
@@ -517,12 +515,12 @@
 FTP_CMD=${FTP_CMD:=ftp -V}
 PKG_PATH=${PKG_PATH:=/usr/ports/packages/`machine`/all/:${MIRROR}/`uname -r`/packages/`machine`/}
 
-set_version
-
 DESTDIR=${DESTDIR:=/}
 SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
 FORCE_DIR=${FORCE_DIR:=No}
 
+set_version
+
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
 CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
@@ -585,7 +583,7 @@
     echo "!!!  at the end of the proces but it is safer to  !!!" >&2 
     echo "!!!  have a separate root shell open.             !!!" >&2
     echo "!!!  It is needed in order to run /sbin/oreboot.  !!!" >&2
-    echo "!!!  sudo MAY NOT WORK after sets are extracted.  !!!" >&2
+    echo "!!!  doas MAY NOT WORK after sets are extracted.  !!!" >&2
     echo >&2
     echo "enter to continue, ctrl+C to cancel" >&2
     local _temp