From ee307ec1de116035b04c0e0e876334faa7640246 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Wed, 14 May 2014 17:24:57 +0200
Subject: [PATCH] gluon-core: make Lua files proper modules
---
.../files/usr/lib/lua/gluon/site_config.lua | 14 +++++++++++++-
.../files/usr/lib/lua/gluon/sysconfig.lua | 18 +++++++++++-------
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/site_config.lua b/package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
index 0735cd01a..cf1514838 100644
--- a/package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
+++ b/package/gluon-core/files/usr/lib/lua/gluon/site_config.lua
@@ -6,4 +6,16 @@ local function loader()
end
-- setfenv doesn't work with Lua 5.2 anymore, but we're using 5.1
-return setfenv(assert(load(coroutine.wrap(loader), 'site.conf')), {})()
+local site_config = setfenv(assert(load(coroutine.wrap(loader), 'site.conf')), {})()
+
+local setmetatable = setmetatable
+
+module 'gluon.site_config'
+
+setmetatable(_M,
+ {
+ __index = site_config,
+ }
+)
+
+return _M
diff --git a/package/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua b/package/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua
index 70882491c..35c5062c1 100644
--- a/package/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua
+++ b/package/gluon-core/files/usr/lib/lua/gluon/sysconfig.lua
@@ -17,11 +17,15 @@ local function set(_, name, val)
f:close()
end
-local sysconfig = {}
-local mt = {
- __index = get,
- __newindex = set,
-}
+local setmetatable = setmetatable
-setmetatable(sysconfig, mt)
-return sysconfig
+module 'gluon.sysconfig'
+
+setmetatable(_M,
+ {
+ __index = get,
+ __newindex = set,
+ }
+)
+
+return _M
--
GitLab