alex
/
gluon-firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2237 from freifunk-gluon/installed-check-site 

Run site check for manual package installations
This commit is contained in:
Matthias Schiffer 2021-07-14 16:20:20 +02:00 committed by GitHub
parent 76a242b595 3a2d176df8
commit 14236ed8f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,7 +360,7 @@ end
function M.need_domain_name(path)
M.need_string(path)
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
f:close()
return true
@ -383,7 +383,7 @@ end
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()
if has_domains then

3
package/gluon.mk
View File

@ -21,7 +21,8 @@ shell-verbatim = $(call shell-unescape,$(call shell-escape,$(1)))
define GluonCheckSite
[ -z "$$IPKG_INSTROOT" ] || "${TOPDIR}/staging_dir/hostpkg/bin/lua" "${TOPDIR}/../scripts/check_site.lua" <<'END__GLUON__CHECK__SITE'
[ -z "$$STAGING_DIR_HOSTPKG" ] || PATH="$$STAGING_DIR_HOSTPKG/bin:$$PATH"
lua "$$IPKG_INSTROOT/lib/gluon/check-site.lua" <<'END__GLUON__CHECK__SITE'
$(call shell-verbatim,cat '$(1)')
END__GLUON__CHECK__SITE
endef