===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.80
retrieving revision 1.89
diff -u -r1.80 -r1.89
--- openbsd/update_openbsd/update_openbsd	2015/11/27 22:38:38	1.80
+++ openbsd/update_openbsd/update_openbsd	2017/11/28 02:56:20	1.89
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.79 2015/11/03 03:56:53 andrew Exp $
+# $AFresh1: update_openbsd,v 1.88 2017/11/28 02:54:34 andrew Exp $
 # 
 # Copyright (c) 2012 Andrew Fresh <andrew@afresh1.com>
 #
@@ -60,7 +60,7 @@
             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
+        elif [ X"http" == X"${_proto}" -o X"https" == X"${_proto}" ]; then
             local _list=`${FTP_CMD} -V -o - ${FTP}/`
             _file=`echo ${_list} | awk '/[^x]base[0-9][0-9]*\.tgz/ { 
                     sub("^.*base","base");
@@ -118,10 +118,13 @@
     fi
 
     if [ X"" != X"${MIRROR}" -a X"" == X"${_v}" ]; then
-        if [ X"No" == X"${FORCE_DIR}" ]; then
-            _dir=${NEW_VER}
-        else
+        if [ X"No" != X"${FORCE_DIR}" ]; then
             _dir=${FORCE_DIR}
+        elif sysctl kern.version | grep -q -- '-current '; then
+            _dir=snapshots
+            FORCE_DIR=snapshots
+        else
+            _dir=${NEW_VER}
         fi
         FTP=${MIRROR}/${_dir}/`machine`
 
@@ -339,7 +342,7 @@
     done
 
     if [ X"" == X"${_missing_sets}" ]; then
-        echo '===> All OK'
+        echo 'All OK'
     fi
 
     local _type
@@ -382,7 +385,7 @@
         local _is_boot=""
         [ X"$BOOT_KERNEL" == X"/${_bd}" ] && _is_boot="# boot kernel"
         
-        echo "===> Copying $_b to /$_bd $_is_boot"
+        echo "Copying $_b to /$_bd $_is_boot"
         cp ${_b} /nbsd && mv /nbsd /${_bd}
         if [ $? -ne 0 ]; then
             echo ERROR: Could not copy new $_bd kernel! >&2
@@ -431,7 +434,7 @@
             _path=/var/tmp/temproot
         fi
 
-        echo "===> Extracting $_f to $_path"
+        echo "Extracting $_f to $_path"
         mkdir -p $_path
         tar -C $_path -xzphf ${RELEASEDIR}/${_f}
         if [ $? -ne 0 ]; then
@@ -519,6 +522,8 @@
 SYSMERGE=${SYSMERGE:=/usr/sbin/sysmerge}
 FORCE_DIR=${FORCE_DIR:=No}
 
+export PKG_PATH TRUSTED_PKG_PATH
+
 set_version
 
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
@@ -531,17 +536,19 @@
 echo "-= update_openbsd - helper script to update OpenBSD =-"
 echo "------------------------------------------------------"
 echo
-echo "       SYSMERGE: $SYSMERGE"
-echo "         MIRROR: $MIRROR"
-echo "     RELEASEDIR: $RELEASEDIR"
-echo "        DESTDIR: $DESTDIR"
-echo "    BOOT_KERNEL: $BOOT_KERNEL"
-echo "INSTALL_KERNELS: $INSTALL_KERNELS"
-echo " INSTALLED_SETS: $INSTALLED_SETS"
+echo "        SYSMERGE: $SYSMERGE"
+echo "          MIRROR: $FTP"
+echo "        PKG_PATH: $PKG_PATH"
+echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
+echo "      RELEASEDIR: $RELEASEDIR"
+echo "         DESTDIR: $DESTDIR"
+echo "     BOOT_KERNEL: $BOOT_KERNEL"
+echo " INSTALL_KERNELS: $INSTALL_KERNELS"
+echo "  INSTALLED_SETS: $INSTALLED_SETS"
 echo
-echo "        CUR_VER: $CUR_VER"
-echo "        NEW_VER: $NEW_VER"
-#echo "       FILE_VER: $FILE_VER"
+echo "         CUR_VER: $CUR_VER"
+echo "         NEW_VER: $NEW_VER"
+#echo "        FILE_VER: $FILE_VER"
 echo
 
 for k in $INSTALL_KERNELS; do
@@ -611,19 +618,23 @@
     fi
     update_etc
 
-    OPENUP=$( which openup )
+    OPENUP=$( which openup 2>/dev/null )
     if [ -n "$OPENUP" ]; then
         echo "==> UPDATING WITH $OPENUP"
         $OPENUP
     else
         echo '==> UPDATING PACKAGES'
-        pkg_add -ui -F update -F updatedepends
+        pkg_add -u
     fi
 
     echo '==> UPDATING FIRMWARE'
     fw_update
 
 else
+    [ -e /etc/rc.sysmerge ] && grep -q $SYSMERGE /etc/rc.sysmerge ||
+        echo "$SYSMERGE -b" >>/etc/rc.sysmerge &&
+        echo "==> RUNNING $SYSMERGE -b ON REBOOT"
+
     echo Instructions for updating to the new version available from 
     if [ X"snapshots" == X"$FORCE_DIR" ]; then
         echo "  http://www.openbsd.org/faq/current.html"