From 6bb08fc68fb203fdb5e362b6be259a0311a474e0 Mon Sep 17 00:00:00 2001 From: Adam Date: Sun, 25 Sep 2022 17:08:21 -0400 Subject: [PATCH] Added in ability to have `init.so` as a require for cpath. (#1126) --- data/core/start.lua | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/data/core/start.lua b/data/core/start.lua index cb66b0f4..b22db019 100644 --- a/data/core/start.lua +++ b/data/core/start.lua @@ -22,9 +22,16 @@ package.path = USERDIR .. '/?.lua;' .. package.path package.path = USERDIR .. '/?/init.lua;' .. package.path local suffix = PLATFORM == "Mac OS X" and 'lib' or (PLATFORM == "Windows" and 'dll' or 'so') - -package.cpath = USERDIR .. '/?.' .. ARCH .. "." .. suffix .. ";" .. DATADIR .. '/?.' .. ARCH .. "." .. suffix .. - USERDIR .. '/?.' .. suffix .. ";" .. DATADIR .. '/?.' .. suffix +package.cpath = + USERDIR .. '/?.' .. ARCH .. "." .. suffix .. ";" .. + USERDIR .. '/?/init.' .. ARCH .. "." .. suffix .. ";" .. + USERDIR .. '/?.' .. suffix .. ";" .. + USERDIR .. '/?/init.' .. suffix .. ";" .. + DATADIR .. '/?.' .. ARCH .. "." .. suffix .. + DATADIR .. '/?/init.' .. ARCH .. "." .. suffix .. + DATADIR .. '/?.' .. suffix .. + DATADIR .. '/?/init.' .. suffix + package.native_plugins = {} package.searchers = { package.searchers[1], package.searchers[2], function(modname) local path = package.searchpath(modname, package.cpath)