From 99687c3d28775f5befc9b2105b094882bfa940a8 Mon Sep 17 00:00:00 2001
From: "kepler155c@gmail.com" <kepler155c@gmail.com>
Date: Wed, 21 Nov 2018 12:10:20 -0500
Subject: [PATCH] new release prep

---
 sys/apis/packages.lua     | 12 ++++++++----
 sys/extensions/4.user.lua | 11 +++++++++++
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/sys/apis/packages.lua b/sys/apis/packages.lua
index ba671c5..f8d2aa1 100644
--- a/sys/apis/packages.lua
+++ b/sys/apis/packages.lua
@@ -1,6 +1,6 @@
 local Util = require('util')
 
-local fs = _G.fs
+local fs        = _G.fs
 local textutils = _G.textutils
 
 local PACKAGE_DIR = 'packages'
@@ -24,7 +24,7 @@ function Packages:list()
 	if self.packageList then
 		return self.packageList
 	end
-	self.packageList = Util.readTable('sys/packageList.lua') or { }
+	self.packageList = Util.readTable('usr/config/packages') or { }
 
 	return self.packageList
 end
@@ -42,9 +42,13 @@ function Packages:getManifest(package)
 	local url = list and list[package]
 
 	if url then
-		local c = Util.httpGet(url) -- will need to call load
+		local c = Util.httpGet(url)
 		if c then
-			return textutils.unserialize(c)
+			c = textutils.unserialize(c)
+			if c then
+				c.repository = c.repository:gsub('{{OPUS_BRANCH}}', _G.OPUS_BRANCH)
+				return c
+			end
 		end
 	end
 end
diff --git a/sys/extensions/4.user.lua b/sys/extensions/4.user.lua
index e7dfa61..662fc6f 100644
--- a/sys/extensions/4.user.lua
+++ b/sys/extensions/4.user.lua
@@ -24,6 +24,17 @@ if not fs.exists('usr/config/shell') then
 	})
 end
 
+if not fs.exists('usr/config/packages') then
+	local packages = {
+		[ 'develop-1.8' ] = 'https://pastebin.com/raw/WhEiNGZE',
+		[ 'master-1.8' ] = 'https://pastebin.com/raw/pexZpAxt',
+	}
+
+	if packages[_G.OPUS_BRANCH] then
+		Util.download(packages[_G.OPUS_BRANCH], 'usr/config/packages')
+	end
+end
+
 local config = Util.readTable('usr/config/shell')
 if config.aliases then
 	for k in pairs(shell.aliases()) do