===================================================================
RCS file: /cvs/openbsd/update_openbsd/update_openbsd,v
retrieving revision 1.86
retrieving revision 1.93
diff -u -r1.86 -r1.93
--- openbsd/update_openbsd/update_openbsd	2017/03/01 03:22:51	1.86
+++ openbsd/update_openbsd/update_openbsd	2017/11/28 03:54:31	1.93
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $AFresh1: update_openbsd,v 1.85 2017/03/01 03:22:01 andrew Exp $
+# $AFresh1: update_openbsd,v 1.92 2017/11/28 03:29:59 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`
 
@@ -511,9 +514,8 @@
     . ${HOME}/.update_openbsdrc
 fi
 
-#MIRROR=${MIRROR:=ftp://ftp.openbsd.org/pub/OpenBSD}
+MIRROR=${MIRROR:=http://fastly.cdn.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}
@@ -523,6 +525,9 @@
 
 set_version
 
+PKG_PATH=${PKG_PATH:=${MIRROR}/${FORCE_DIR:=$NEW_VER}/packages/`machine -a`/}
+TRUSTED_PKG_PATH=${TRUSTED_PKG_PATH:=/usr/ports/packages/`machine -a`/all/}
+
 INSTALLED_SETS=${INSTALLED_SETS:=`installed_sets`}
 
 CHECKSUM_TYPES=${CHECKSUM_TYPES:=SHA256.sig SHA256}
@@ -534,7 +539,7 @@
 echo "------------------------------------------------------"
 echo
 echo "        SYSMERGE: $SYSMERGE"
-echo "          MIRROR: $MIRROR"
+echo "          MIRROR: $FTP"
 echo "        PKG_PATH: $PKG_PATH"
 echo "TRUSTED_PKG_PATH: $TRUSTED_PKG_PATH"
 echo "      RELEASEDIR: $RELEASEDIR"