From 504f70f3b7724d8449be76a06dba13f22a1b73f4 Mon Sep 17 00:00:00 2001 From: Philipp Janda Date: Sun, 13 Oct 2013 20:05:59 +0200 Subject: wrapper scripts don't mess with env-vars of subprocesses --- Makefile | 7 +------ src/luarocks/fs/unix.lua | 13 +------------ src/luarocks/fs/win32.lua | 8 +------- 3 files changed, 3 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index ee06b670..cb7dbd09 100644 --- a/Makefile +++ b/Makefile @@ -174,11 +174,6 @@ write_sysconfig: built install: install_bins install_luas install_site_config write_sysconfig bootstrap: src/luarocks/site_config.lua install_site_config write_sysconfig - if [ -n "$$LUA_PATH_5_2" ] ;\ - then \ - LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" LUA_PATH_5_2="$$PWD/src/?.lua;$$LUA_PATH_5_2" src/bin/luarocks make rockspec --tree="$(PREFIX)" ;\ - else \ - LUA_PATH="$$PWD/src/?.lua;$$LUA_PATH" src/bin/luarocks make rockspec --tree="$(PREFIX)" ;\ - fi + '$(LUA_BINDIR)/lua$(LUA_SUFFIX)' -e "package.path=[[$$PWD/src/?.lua;]]..package.path" src/bin/luarocks make rockspec --tree="$(PREFIX)" install_rock: install_bins install_luas 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) return nil, "Could not open "..wrapname.." for writing." end wrapper:write("#!/bin/sh\n\n") - wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n') - wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n') - wrapper:write('export LUA_PATH LUA_CPATH\n') - wrapper:write('if [ -n "$LUA_PATH_5_2" ]; then\n') - wrapper:write(' LUA_PATH_5_2="'..package.path..';$LUA_PATH_5_2"\n') - wrapper:write(' export LUA_PATH_5_2\n') - wrapper:write('fi\n') - wrapper:write('if [ -n "$LUA_CPATH_5_2" ]; then\n') - wrapper:write(' LUA_CPATH_5_2="'..package.cpath..';$LUA_CPATH_5_2"\n') - wrapper:write(' export LUA_CPATH_5_2\n') - wrapper:write('fi\n') - wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n') + 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') wrapper:close() if fs.chmod(wrapname, "0755") then 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) return nil, "Could not open "..wrapname.." for writing." end wrapper:write("@echo off\n") - wrapper:write("setlocal\n") - wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n") - wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n") - wrapper:write('if not "%LUA_PATH_5_2%"=="" set LUA_PATH_5_2='..package.path..";%LUA_PATH_5_2%\n") - wrapper:write('if not "%LUA_CPATH_5_2%"=="" set LUA_CPATH_5_2='..package.cpath..";%LUA_CPATH_5_2%\n") - wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e"luarocks.loader.add_context([['..name..']],[['..version..']])" "'..file..'" %*\n') - wrapper:write("endlocal\n") + 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') wrapper:close() return true end -- cgit v1.2.3-55-g6feb