diff --git a/etc/api b/etc/api index 4dec800..30f7203 160000 --- a/etc/api +++ b/etc/api @@ -1 +1 @@ -Subproject commit 4dec8003ed89e5a05ee992448747096f72ce718b +Subproject commit 30f7203c5fe69e875dbd29a4da9fe0c5ab1ddc9b diff --git a/init.lua b/init.lua index 53c8515..be69f72 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,3 @@ -package.path = 'etc/?.lua;etc/?/init.lua;?.lua;?/init.lua;' .. package.path +package.path = 'etc/?.lua;etc/?/init.lua;' .. package.path require 'src.parts.core' diff --git a/src/parts/core.lua b/src/parts/core.lua index b616a4d..8e072a8 100644 --- a/src/parts/core.lua +++ b/src/parts/core.lua @@ -1,4 +1,4 @@ -local config = require 'config' +local config = require 'config' local Core = { config = config, @@ -14,9 +14,8 @@ function Core:load(what) print(('Loading %s (%d / %d) %s...'):format(what:sub(0, -2), i, s, v)) -- Lint - local e, a = pcall(require, 'src.'.. what ..'.'.. v) - print(e, a) - if e then + if pcall(require, 'src.'.. what ..'.'.. v) then + local a=require('src.'.. what ..'.'.. v) if what == 'events' then self.api:on(v, a) elseif what == 'cmds' then self.cmds[v] = a elseif what == 'parts' then a(self) diff --git a/start.sh b/start.sh index e8c615f..dd7d2e5 100755 --- a/start.sh +++ b/start.sh @@ -1,3 +1,3 @@ #!/bin/sh cd $(dirname $0) -luajit init.lua || lua5.3 init.lua +lua5.3 init.lua