From 14d06b07c9b2255a52f3ba2afa65bb9ce2fa7654 Mon Sep 17 00:00:00 2001 From: Andreas Fidjeland Date: Sun, 10 Nov 2013 22:13:00 +0000 Subject: map_trees deals with both string and table trees Fixes #178 --- src/luarocks/path.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua index f5a7e9ed..f8ae15c0 100644 --- a/src/luarocks/path.lua +++ b/src/luarocks/path.lua @@ -336,7 +336,7 @@ function map_trees(deps_mode, fn, ...) use = true end for _, tree in ipairs(cfg.rocks_trees) do - if dir.normalize(tree) == dir.normalize(cfg.root_dir) then + if dir.normalize(rocks_tree_to_string(tree)) == dir.normalize(rocks_tree_to_string(cfg.root_dir)) then use = true end if use then -- cgit v1.2.3-55-g6feb From e05effd09a8e2df4e7cff301392fba0933c5eed7 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 12 Nov 2013 18:47:53 -0200 Subject: Allow the wrapper scripts to keep working even if LuaRocks is uninstalled (or if one is building them to run in another box without LuaRocks, for example, in cross-compiling scenarios). --- src/luarocks/fs/unix.lua | 4 ++-- src/luarocks/fs/win32.lua | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua index 9dc3b6a6..d231222b 100644 --- a/src/luarocks/fs/unix.lua +++ b/src/luarocks/fs/unix.lua @@ -61,8 +61,8 @@ function wrap_script(file, dest, name, version) wrapper:write("#!/bin/sh\n\n") local lua = dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter) local ppaths = "package.path="..util.LQ(lpath..";").."..package.path; package.cpath="..util.LQ(lcpath..";").."..package.cpath" - local addctx = "luarocks.loader.add_context("..util.LQ(name)..","..util.LQ(version)..")" - wrapper:write('exec '..fs.Q(lua)..' -e '..fs.Q(ppaths)..' -lluarocks.loader -e '..fs.Q(addctx)..' '..fs.Q(file)..' "$@"\n') + local addctx = "local k,l,_=pcall(require,"..util.LQ("luarocks.loader")..") _=k and l.add_context("..util.LQ(name)..","..util.LQ(version)..")" + wrapper:write('exec '..fs.Q(lua)..' -e '..fs.Q(ppaths)..' -e '..fs.Q(addctx)..' '..fs.Q(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 78a9f730..0280b3f0 100644 --- a/src/luarocks/fs/win32.lua +++ b/src/luarocks/fs/win32.lua @@ -113,8 +113,8 @@ function wrap_script(file, dest, name, version) wrapper:write("@echo off\n") local lua = dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter) local ppaths = "package.path="..util.LQ(lpath..";").."..package.path; package.cpath="..util.LQ(lcpath..";").."..package.cpath" - local addctx = "luarocks.loader.add_context("..util.LQ(name)..","..util.LQ(version)..")" - wrapper:write(fs.Qb(lua)..' -e '..fs.Qb(ppaths)..' -lluarocks.loader -e '..fs.Qb(addctx)..' '..fs.Qb(file)..' %*\n') + local addctx = "local k,l,_=pcall(require,"..util.LQ("luarocks.loader")..") _=k and l.add_context("..util.LQ(name)..","..util.LQ(version)..")" + wrapper:write(fs.Qb(lua)..' -e '..fs.Qb(ppaths)..' -e '..fs.Qb(addctx)..' '..fs.Qb(file)..' %*\n') wrapper:close() return true end -- cgit v1.2.3-55-g6feb From 66bf838d59c30be7f65ed56a1b3efc8441dc987c Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Tue, 12 Nov 2013 20:08:29 -0200 Subject: Remove incompatibility in the sed command, as reported in the Lua mailing list. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3b0334c8..7a9eae1e 100644 --- a/Makefile +++ b/Makefile @@ -28,7 +28,7 @@ purge.lua path.lua write_rockspec.lua CONFIG_FILE = $(SYSCONFDIR)/config-$(LUA_VERSION).lua -SAFEPWD=`echo "$$PWD" | sed -e 's/\([][]\)\1/]]..'\''\1\1'\''..[[/g' -` +SAFEPWD=`echo "$$PWD" | sed -e 's/\([][]\)\1/]]..'\''\1\1'\''..[[/g'` all: @echo "- Type 'make build' and 'make install':" -- cgit v1.2.3-55-g6feb