diff options
| author | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-22 23:14:10 +0000 |
|---|---|---|
| committer | hisham <hisham@9ca3f7c1-7366-0410-b1a3-b5c78f85698c> | 2009-10-22 23:14:10 +0000 |
| commit | d6b306114a2fc6af683df38f2a640b5a5d5e93d6 (patch) | |
| tree | c41b89e0b8d5f06053012f717b7ee8aada478bac /src | |
| parent | f02d6d296428902c4536353e55f43de11effd675 (diff) | |
| download | luarocks-d6b306114a2fc6af683df38f2a640b5a5d5e93d6.tar.gz luarocks-d6b306114a2fc6af683df38f2a640b5a5d5e93d6.tar.bz2 luarocks-d6b306114a2fc6af683df38f2a640b5a5d5e93d6.zip | |
use luarocks.loader
git-svn-id: http://luarocks.org/svn/luarocks/trunk@108 9ca3f7c1-7366-0410-b1a3-b5c78f85698c
Diffstat (limited to 'src')
| -rw-r--r-- | src/luarocks/fs/unix.lua | 2 | ||||
| -rw-r--r-- | src/luarocks/fs/win32.lua | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua index b63f8ee7..94a3ad4e 100644 --- a/src/luarocks/fs/unix.lua +++ b/src/luarocks/fs/unix.lua | |||
| @@ -50,7 +50,7 @@ function wrap_script(file, dest) | |||
| 50 | wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') | 50 | wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') |
| 51 | wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n') | 51 | wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n') |
| 52 | wrapper:write('export LUA_PATH LUA_CPATH\n') | 52 | wrapper:write('export LUA_PATH LUA_CPATH\n') |
| 53 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.require "'..file..'" "$@"\n') | 53 | wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader "'..file..'" "$@"\n') |
| 54 | wrapper:close() | 54 | wrapper:close() |
| 55 | if fs.execute("chmod +x",wrapname) then | 55 | if fs.execute("chmod +x",wrapname) then |
| 56 | return true | 56 | return true |
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua index 7b478cd3..0fccdf86 100644 --- a/src/luarocks/fs/win32.lua +++ b/src/luarocks/fs/win32.lua | |||
| @@ -71,7 +71,7 @@ function wrap_script(file, dest) | |||
| 71 | wrapper:write("setlocal\n") | 71 | wrapper:write("setlocal\n") |
| 72 | wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n") | 72 | wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n") |
| 73 | wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n") | 73 | wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n") |
| 74 | wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.require "'..file..'" %*\n') | 74 | wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader "'..file..'" %*\n') |
| 75 | wrapper:write("endlocal\n") | 75 | wrapper:write("endlocal\n") |
| 76 | wrapper:close() | 76 | wrapper:close() |
| 77 | return true | 77 | return true |