===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.78
retrieving revision 1.81
diff -u -r1.78 -r1.81
--- openbsd/update_openbsd/update_openbsd	2015/10/12 00:35:14	1.78
+++ openbsd/update_openbsd/update_openbsd	2015/11/27 22:39:14	1.81
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.77 2015/05/03 00:11:52 andrew Exp $
+# $AFresh1: update_openbsd,v 1.80 2015/11/27 22:38:38 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -471,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
@@ -515,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}
@@ -611,7 +611,7 @@
     fi
     update_etc
 
-    OPENUP=$( which openup )
+    OPENUP=$( which openup 2>/dev/null )
     if [ -n "$OPENUP" ]; then
         echo "==> UPDATING WITH $OPENUP"
         $OPENUP