4 files changed, 6 insertions, 6 deletions

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':"
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
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