diff options
| author | Philipp Janda <siffiejoe@gmx.net> | 2013-09-26 10:48:20 +0200 |
|---|---|---|
| committer | Philipp Janda <siffiejoe@gmx.net> | 2013-09-26 10:48:20 +0200 |
| commit | fc9d5bb39c677b8515c118cd74fb572e681023f1 (patch) | |
| tree | cd3cad1b57eaed3a7d5a3d5f5319cb3c909558ce | |
| parent | 4745a6e42598414fb38565c75e84bd13723372ba (diff) | |
| download | luarocks-fc9d5bb39c677b8515c118cd74fb572e681023f1.tar.gz luarocks-fc9d5bb39c677b8515c118cd74fb572e681023f1.tar.bz2 luarocks-fc9d5bb39c677b8515c118cd74fb572e681023f1.zip | |
adding Lua 5.2 paths to wrapper scripts
| -rw-r--r-- | src/luarocks/fs/unix.lua | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua index cccbbd33..cb5e634d 100644 --- a/src/luarocks/fs/unix.lua +++ b/src/luarocks/fs/unix.lua | |||
| @@ -61,6 +61,14 @@ function wrap_script(file, dest, name, version) | |||
| 61 | wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') | 61 | wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') |
| 62 | wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n') | 62 | wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n') |
| 63 | wrapper:write('export LUA_PATH LUA_CPATH\n') | 63 | wrapper:write('export LUA_PATH LUA_CPATH\n') |
| 64 | wrapper:write('if [ -n "$LUA_PATH_5_2" ]; then\n') | ||
| 65 | wrapper:write(' LUA_PATH_5_2="'..package.path..';$LUA_PATH_5_2"\n') | ||
| 66 | wrapper:write(' export LUA_PATH_5_2\n') | ||
| 67 | wrapper:write('fi\n') | ||
| 68 | wrapper:write('if [ -n "$LUA_CPATH_5_2" ]; then\n') | ||
| 69 | wrapper:write(' LUA_CPATH_5_2="'..package.cpath..';$LUA_CPATH_5_2"\n') | ||
| 70 | wrapper:write(' export LUA_CPATH_5_2\n') | ||
| 71 | wrapper:write('fi\n') | ||
| 64 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n') | 72 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n') |
| 65 | wrapper:close() | 73 | wrapper:close() |
| 66 | if fs.chmod(wrapname, "0755") then | 74 | if fs.chmod(wrapname, "0755") then |