Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Put homedir before /usr/share in lua search path 

Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Stephen Sugden 2009-09-04 12:53:38 -07:00 committed by Julien Danjou
parent 9bfc4b0017
commit b6a066b040
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
luaa.c
View File

@ -805,7 +805,7 @@ luaA_init(xdgHandle* xdg)
globalconf.hooks.timer = LUA_REFNIL; globalconf.hooks.timer = LUA_REFNIL;
globalconf.hooks.exit = LUA_REFNIL; globalconf.hooks.exit = LUA_REFNIL;
/* add Lua lib path (/usr/share/awesome/lib by default) */ /* add Lua search paths */
lua_getglobal(L, "package"); lua_getglobal(L, "package");
if (LUA_TTABLE != lua_type(L, 1)) if (LUA_TTABLE != lua_type(L, 1))
{ {
@ -819,9 +819,6 @@ luaA_init(xdgHandle* xdg)
lua_pop(L, 1); lua_pop(L, 1);
return; return;
} }
lua_pushliteral(L, ";" AWESOME_LUA_LIB_PATH "/?.lua");
lua_pushliteral(L, ";" AWESOME_LUA_LIB_PATH "/?/init.lua");
lua_concat(L, 3); /* concatenate with package.path */
/* add XDG_CONFIG_DIR as include path */ /* add XDG_CONFIG_DIR as include path */
const char * const *xdgconfigdirs = xdgSearchableConfigDirectories(xdg); const char * const *xdgconfigdirs = xdgSearchableConfigDirectories(xdg);
@ -840,6 +837,11 @@ luaA_init(xdgHandle* xdg)
lua_concat(L, 3); /* concatenate with package.path */ lua_concat(L, 3); /* concatenate with package.path */
} }
/* add Lua lib path (/usr/share/awesome/lib by default) */
lua_pushliteral(L, ";" AWESOME_LUA_LIB_PATH "/?.lua");
lua_pushliteral(L, ";" AWESOME_LUA_LIB_PATH "/?/init.lua");
lua_concat(L, 3); /* concatenate with package.path */
lua_setfield(L, 1, "path"); /* package.path = "concatenated string" */ lua_setfield(L, 1, "path"); /* package.path = "concatenated string" */
} }