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

check_site: move site loading logic to check_site_lib (which is renamed to check_site.lua)

Browse Source
This commit is contained in:
Matthias Schiffer 2018-01-19 12:32:32 +01:00
parent 43628c1679
commit 775028475b
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/gluon.mk
View File

@ -11,13 +11,8 @@ shell-verbatim = $(call shell-unescape,$(call shell-escape,$(1)))
define GluonCheckSite define GluonCheckSite
[ -z "$$IPKG_INSTROOT" ] || "${TOPDIR}/staging_dir/hostpkg/bin/lua" -e 'dofile()' <<'END__GLUON__CHECK__SITE' [ -z "$$IPKG_INSTROOT" ] || "${TOPDIR}/staging_dir/hostpkg/bin/lua" "${TOPDIR}/../scripts/check_site.lua" <<'END__GLUON__CHECK__SITE'
local f = assert(io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/site.json')) $(call shell-verbatim,cat '$(1)')
local site_json = f:read('*a')
f:close()
site = require('cjson').decode(site_json)
$(call shell-verbatim,cat '$(TOPDIR)/../scripts/check_site_lib.lua' '$(1)')
END__GLUON__CHECK__SITE END__GLUON__CHECK__SITE
endef endef

15
scripts/check_site_lib.lua → scripts/check_site.lua
View File

@ -1,3 +1,15 @@
local cjson = require 'cjson'
local function load_json(filename)
local f = assert(io.open(filename))
local json = cjson.decode(f:read('*a'))
f:close()
return json
end
local site = load_json(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/site.json')
function in_site(var) function in_site(var)
return var return var
end end
@ -170,3 +182,6 @@ end
function need_array_of(path, array, required) function need_array_of(path, array, required)
return need_array(path, function(e) need_one_of(e, array) end, required) return need_array(path, function(e) need_one_of(e, array) end, required)
end end
dofile()