From a04d38838f05c2ae4f41ae964a5ee66578d68fcf Mon Sep 17 00:00:00 2001
From: Josef 'Jeff' Sipek <jeffpc@josefsipek.net>
Date: Sun, 1 Jul 2018 15:54:48 -0400
Subject: [PATCH] standardize the pkg repo URLs

---
 README.md         |  8 ++++----
 build_image.sh    | 10 +++++-----
 build_zfs_send.sh |  8 ++++----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index d57fb41..efded8d 100644
--- a/README.md
+++ b/README.md
@@ -4,12 +4,12 @@ Using Kayak
 Building
 --------
 
- * Set PKGURL to be the source of the OmniOS bits we wish to install with
-   kayak, in case it's not the default "omnios" publisher for whatever release
-   branch you have checked out.
+ * Set `PKGURL1` to point to the pkg repo with the unleashed publisher.
+ * Set `PKGURL2` to point to the pkg repo with the userland publisher.
+ * Set `VERSION` to the desired version (e.g., "v1.0")
 
  * zfs create rpool/kayak_image
- * gmake BUILDSEND=rpool/kayak_image
+ * gmake install-usb BUILDSEND=rpool/kayak_image
 
 Operation
 ---------
diff --git a/build_image.sh b/build_image.sh
index 182c4df..758383f 100755
--- a/build_image.sh
+++ b/build_image.sh
@@ -23,8 +23,8 @@ fail() {
 # NOTE --> The URL needs to be updated with every release.
 # Change "bloody" to whatever release the current branch is.
 PUBLISHER=unleashed
-PKGURL=${PKGURL-/usr/nightly/packages/i386/nightly/repo.redist}
-USERLAND=${USERLAND-/ws/oi-userland/i386/repo}
+PKGURL1=${PKGURL1-/usr/nightly/packages/i386/nightly/repo.redist}
+PKGURL2=${PKGURL2-/ws/oi-userland/i386/repo}
 : ${GZIP_CMD:=gzip}
 SRCDIR=$(dirname $0)
 DIDWORK=0
@@ -245,9 +245,9 @@ step() {
 
 	"pkg")
 
-	echo "Creating image of $PUBLISHER from $PKGURL"
-	$PKG image-create -F -p $PUBLISHER=$PKGURL $ROOTDIR || fail "image-create"
-        $PKG -R $ROOTDIR set-publisher -p $USERLAND || fail 'userland'
+	echo "Creating image of $PUBLISHER from $PKGURL1"
+	$PKG image-create -F -p $PUBLISHER=$PKGURL1 $ROOTDIR || fail "image-create"
+        $PKG -R $ROOTDIR set-publisher -p $PKGURL2 || fail 'userland'
 	$PKG -R $ROOTDIR install $PKGS || fail "install"
 	chkpt fixup
 	;;
diff --git a/build_zfs_send.sh b/build_zfs_send.sh
index c6aee82..43b95b4 100755
--- a/build_zfs_send.sh
+++ b/build_zfs_send.sh
@@ -30,8 +30,8 @@ fail() {
 }
 
 PUBLISHER=unleashed
-PKGURL=${PKGURL-/usr/nightly/packages/i386/nightly/repo.redist}
-PKGUSERLAND=${PKGURL-/ws/oi-userland/i386/repo}
+PKGURL1=${PKGURL1-/usr/nightly/packages/i386/nightly/repo.redist}
+PKGURL2=${PKGURL2-/ws/oi-userland/i386/repo}
 : ${BZIP2:=bzip2}
 ZROOT=rpool
 OUT=
@@ -68,8 +68,8 @@ if zfs list $ZROOT/$name@entire > /dev/null 2>&1; then
 else
   zfs create $ZROOT/$name || fail "zfs create"
   MP=`zfs get -H mountpoint $ZROOT/$name | awk '{print $3}'`
-  pkg image-create -F -p $PUBLISHER=$PKGURL $MP || fail "image-create"
-  pkg -R $MP set-publisher --non-sticky -p $PKGUSERLAND
+  pkg image-create -F -p $PUBLISHER=$PKGURL1 $MP || fail "image-create"
+  pkg -R $MP set-publisher --non-sticky -p $PKGURL2
   pkg -R $MP install osnet-redistributable developer/opensolaris/osnet $USERLAND_PACKAGES || fail 'install'
   zfs snapshot $ZROOT/$name@entire
 fi
-- 
2.11.4.GIT