nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-core: gluon-check-site: do not fail when IPKG_INSTROOT is unset

Browse Source
This commit is contained in:
Matthias Schiffer 2021-06-13 00:55:40 +02:00
parent eb3fad4bae
commit 298723c22b
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/gluon-core/luasrc/lib/gluon/check-site.lua
View File

@ -360,7 +360,7 @@ end
function M.need_domain_name(path) function M.need_domain_name(path)
M.need_string(path) M.need_string(path)
M.need(path, function(domain_name) M.need(path, function(domain_name)
local f = io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/domains/' .. domain_name .. '.json') local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/domains/' .. domain_name .. '.json')
if not f then return false end if not f then return false end
f:close() f:close()
return true return true
@ -383,7 +383,7 @@ end
local check = setfenv(assert(loadfile()), M) local check = setfenv(assert(loadfile()), M)
site = assert(json.load(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/site.json')) site = assert(json.load((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/site.json'))
local ok, err = pcall(function() local ok, err = pcall(function()
if has_domains then if has_domains then