diff --git a/README.md b/README.md index 7b5e66d..3a2d070 100644 --- a/README.md +++ b/README.md @@ -15,4 +15,5 @@ ## Install ``` pastebin run uzghlbnc +reboot ``` diff --git a/sys/boot/opus.boot b/sys/boot/opus.boot index 2a02d14..fbf23a0 100644 --- a/sys/boot/opus.boot +++ b/sys/boot/opus.boot @@ -19,7 +19,7 @@ local function run(file, ...) end _G._syslog = function() end -_G.OPUS_BRANCH = 'develop-1.8' +_G.OPUS_BRANCH = 'master-1.8' -- Install require shim _G.requireInjector = run('sys/modules/opus/injector.lua') diff --git a/sys/modules/opus/git.lua b/sys/modules/opus/git.lua index 49c42e4..055fe8b 100644 --- a/sys/modules/opus/git.lua +++ b/sys/modules/opus/git.lua @@ -3,12 +3,16 @@ local Util = require('opus.util') local TREE_URL = 'https://api.github.com/repos/%s/%s/git/trees/%s?recursive=1' local FILE_URL = 'https://raw.githubusercontent.com/%s/%s/%s/%s' +local TREE_HEADERS = {} local git = { } if _G._GIT_API_KEY then - TREE_URL = TREE_URL .. '&access_token=' .. _G._GIT_API_KEY + TREE_HEADERS.Authorization = 'token ' .. _G._GIT_API_KEY end +local fs = _G.fs +local os = _G.os + function git.list(repository) local t = Util.split(repository, '(.-)/') @@ -23,8 +27,10 @@ function git.list(repository) local function getContents() local dataUrl = string.format(TREE_URL, user, repo, branch) - local contents = Util.download(dataUrl) - if contents then + local contents, msg = Util.httpGet(dataUrl,TREE_HEADERS) + if not contents then + error(_sformat('Failed to download %s\n%s', dataUrl, msg), 2) + else return json.decode(contents) end end