diff options
| author | Philipp Janda <siffiejoe@gmx.net> | 2013-10-13 20:05:59 +0200 |
|---|---|---|
| committer | Philipp Janda <siffiejoe@gmx.net> | 2013-10-13 20:05:59 +0200 |
| commit | 504f70f3b7724d8449be76a06dba13f22a1b73f4 (patch) | |
| tree | c6aee50b3071c6b7d6ae6c8fe3b54a30c609f7fc /src | |
| parent | 309ad25d1ac13584e8c7656833bb632c5e179036 (diff) | |
| download | luarocks-504f70f3b7724d8449be76a06dba13f22a1b73f4.tar.gz luarocks-504f70f3b7724d8449be76a06dba13f22a1b73f4.tar.bz2 luarocks-504f70f3b7724d8449be76a06dba13f22a1b73f4.zip | |
wrapper scripts don't mess with env-vars of subprocesses
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/fs/unix.lua | 13 | ||||
| -rw-r--r-- | src/luarocks/fs/win32.lua | 8 |
2 files changed, 2 insertions, 19 deletions
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua index cb5e634d..92f9abc1 100644 --- a/src/luarocks/fs/unix.lua +++ b/src/luarocks/fs/unix.lua | |||
| @@ -58,18 +58,7 @@ function wrap_script(file, dest, name, version) | |||
| 58 | return nil, "Could not open "..wrapname.." for writing." | 58 | return nil, "Could not open "..wrapname.." for writing." |
| 59 | end | 59 | end |
| 60 | wrapper:write("#!/bin/sh\n\n") | 60 | wrapper:write("#!/bin/sh\n\n") |
| 61 | wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') | 61 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -e \'package.path=[['..package.path..';]]..package.path\' -e \'package.cpath=[['..package.cpath..';]]..package.cpath\' -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n') |
| 62 | wrapper:write('LUA_CPATH="'..package.cpath..';$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') | ||
| 72 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n') | ||
| 73 | wrapper:close() | 62 | wrapper:close() |
| 74 | if fs.chmod(wrapname, "0755") then | 63 | if fs.chmod(wrapname, "0755") then |
| 75 | return true | 64 | return true |
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua index 2bc595f6..6872dc47 100644 --- a/src/luarocks/fs/win32.lua +++ b/src/luarocks/fs/win32.lua | |||
| @@ -68,13 +68,7 @@ function wrap_script(file, dest, name, version) | |||
| 68 | return nil, "Could not open "..wrapname.." for writing." | 68 | return nil, "Could not open "..wrapname.." for writing." |
| 69 | end | 69 | end |
| 70 | wrapper:write("@echo off\n") | 70 | wrapper:write("@echo off\n") |
| 71 | wrapper:write("setlocal\n") | 71 | wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -e "package.path=[['..package.path..';]]..package.path" -e "package.cpath=[['..package.cpath..';]]..package.cpath" -lluarocks.loader -e"luarocks.loader.add_context([['..name..']],[['..version..']])" "'..file..'" %*\n') |
| 72 | wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n") | ||
| 73 | wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n") | ||
| 74 | wrapper:write('if not "%LUA_PATH_5_2%"=="" set LUA_PATH_5_2='..package.path..";%LUA_PATH_5_2%\n") | ||
| 75 | wrapper:write('if not "%LUA_CPATH_5_2%"=="" set LUA_CPATH_5_2='..package.cpath..";%LUA_CPATH_5_2%\n") | ||
| 76 | wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e"luarocks.loader.add_context([['..name..']],[['..version..']])" "'..file..'" %*\n') | ||
| 77 | wrapper:write("endlocal\n") | ||
| 78 | wrapper:close() | 72 | wrapper:close() |
| 79 | return true | 73 | return true |
| 80 | end | 74 | end |