diff options
| author | Lauri Aarnio <Lauri.Aarnio@iki.fi> | 2008-09-17 17:21:38 +0300 |
|---|---|---|
| committer | Lauri Leukkunen <lle@rahina.org> | 2008-09-27 00:02:42 +0300 |
| commit | 821f785a70d59817473911f34d7ffca2dce292ce (patch) | |
| tree | cb2b2cf9c5d1bf5a5aaaebcae39782b0535e401e /lua_scripts | |
| parent | a0baecd97308a7b46a84c9b7bb44e455e72aee3b (diff) | |
Eliminated env.var. SBOX_LUA_SCRIPTS - replaced SBOX_LUA_SCRIPTS by SBOX_SESSION_DIR + a symlink in the session directory. SBOX_LUA_SCRIPTS variable still exists inside the "sb2" script, but it is not exported anymore.
Diffstat (limited to 'lua_scripts')
| -rw-r--r-- | lua_scripts/argvenvp.lua | 2 | ||||
| -rw-r--r-- | lua_scripts/main.lua | 8 |
2 files changed, 3 insertions, 7 deletions
diff --git a/lua_scripts/argvenvp.lua b/lua_scripts/argvenvp.lua index 3ca0a66..e4a1639 100644 --- a/lua_scripts/argvenvp.lua +++ b/lua_scripts/argvenvp.lua @@ -10,7 +10,7 @@ argvmods = {} gcc_bindir = os.getenv("SBOX_CROSS_GCC_DIR") if (gcc_bindir ~= nil and gcc_bindir ~= "") then -- this generates gcc related argv/envp manglings - do_file(lua_scripts .. "/argvenvp_gcc.lua") + do_file(session_dir .. "/lua_scripts/argvenvp_gcc.lua") end -- regular mangling rules go here diff --git a/lua_scripts/main.lua b/lua_scripts/main.lua index 2fcdd4f..469425e 100644 --- a/lua_scripts/main.lua +++ b/lua_scripts/main.lua @@ -24,10 +24,6 @@ end session_dir = os.getenv("SBOX_SESSION_DIR") --- SBOX_LUA_SCRIPTS environment variable controls where --- we look for the scriptlets defining the path mappings -lua_scripts = os.getenv("SBOX_LUA_SCRIPTS") - compiler_root = os.getenv("SBOX_COMPILER_ROOT") if (not compiler_root) then compiler_root = "/usr" @@ -38,7 +34,7 @@ do_file(session_dir .. "/sb2-session.conf") do_file(session_dir .. "/exec_config.lua") -- Load mapping- and exec functions -do_file(lua_scripts .. "/mapping.lua") -do_file(lua_scripts .. "/argvenvp.lua") +do_file(session_dir .. "/lua_scripts/mapping.lua") +do_file(session_dir .. "/lua_scripts/argvenvp.lua") -- sb2 is ready for operation! |