Implement user's config as init file and add directory into package.path
Create the user's config init file if lite user's config directory does not exists. No longer use the awkward package.searchers but instead add user's config dir at the end of package path.
This commit is contained in:
+3
-24
@@ -125,34 +125,13 @@ int main(int argc, char **argv) {
|
||||
" EXEDIR = EXEFILE:match(\"^(.+)[/\\\\].*$\")\n"
|
||||
#ifdef LITE_XL_DATA_USE_EXEDIR
|
||||
" DATADIR = EXEDIR .. '/data'\n"
|
||||
" USERDIR = EXEDIR .. '/user'\n"
|
||||
#else
|
||||
" local prefix = EXEDIR:match(\"^(.+)[/\\\\]bin$\")\n"
|
||||
" DATADIR = prefix and (prefix .. '/share/lite-xl') or (EXEDIR .. '/data')\n"
|
||||
" USERDIR = os.getenv(\"HOME\") .. '/.config/lite-xl'\n"
|
||||
|
||||
"table.insert(package.searchers, 1, function(module_name)\n"
|
||||
" if module_name == 'user' or module_name:match('^user%.') then\n"
|
||||
" return function(x_module_name)\n"
|
||||
" local filename, err\n"
|
||||
" if x_module_name == 'user' then\n"
|
||||
" filename = USERDIR..'/init.lua'\n"
|
||||
" else\n"
|
||||
" local modname = x_module_name:gsub('^user%.', '')\n"
|
||||
" filename, err = package.searchpath(modname, USERDIR..'/?.lua;'..USERDIR..'/?/init.lua')\n"
|
||||
" end\n"
|
||||
" if filename then\n"
|
||||
" local module_f, module_err = loadfile(filename)\n"
|
||||
" if module_f then\n"
|
||||
" return module_f()\n"
|
||||
" else\n"
|
||||
" return nil, module_err\n"
|
||||
" end\n"
|
||||
" else\n"
|
||||
" return nil, err\n"
|
||||
" end\n"
|
||||
" end\n"
|
||||
" end\n"
|
||||
"end)\n"
|
||||
" package.path = package.path .. ';' .. DATADIR .. '/?.lua'\n"
|
||||
" package.path = package.path .. ';' .. DATADIR .. '/?/init.lua'\n"
|
||||
#endif
|
||||
" package.path = DATADIR .. '/?.lua;' .. package.path\n"
|
||||
" package.path = DATADIR .. '/?/init.lua;' .. package.path\n"
|
||||
|
||||
Reference in New Issue
Block a user