Browse Source

Update loader;

bjorn 6 years ago
parent
commit
6886fe31ba
2 changed files with 731 additions and 962 deletions
  1. 730 956
      api/init.lua
  2. 1 6
      api/main.lua

File diff suppressed because it is too large
+ 730 - 956
api/init.lua


+ 1 - 6
api/main.lua

@@ -1,10 +1,5 @@
 local serpent = require 'serpent'
 local serpent = require 'serpent'
 
 
--- Make sure init.lua can be required
-if not package.path:match('%./?/init%.lua') then
-  package.path = package.path .. ';./?/init.lua'
-end
-
 -- Helpers
 -- Helpers
 local function copy(t)
 local function copy(t)
   if type(t) ~= 'table' then return t end
   if type(t) ~= 'table' then return t end
@@ -181,7 +176,7 @@ local function processObject(path, parent)
 end
 end
 
 
 local function processModule(path)
 local function processModule(path)
-  local module = require(path)
+  local module = require(path .. '.init') -- So we avoid requiring the module itself
 
 
   module.key = module.external and path:match('[^/]+$') or path:gsub('/', '.')
   module.key = module.external and path:match('[^/]+$') or path:gsub('/', '.')
   module.name = module.external and module.key or module.key:match('[^%.]+$')
   module.name = module.external and module.key or module.key:match('[^%.]+$')

Some files were not shown because too many files changed in this diff