Merge branch 'master' into luarocks-3

2 files changed, 9 insertions, 4 deletions

diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index b5c60ed1..17f76d14 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -15,7 +15,7 @@ local rawset, next, table, pairs, require, io, os, setmetatable, pcall, ipairs,
 
 local cfg = {}
 
-cfg.lua_version = _VERSION:sub(5)
+cfg.lua_version = _VERSION:match(" (5%.[123])$") or "5.1"
 local version_suffix = cfg.lua_version:gsub("%.", "_")
 
 -- Load site-local global configurations
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index c4da9a8e..680b5cfe 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -107,6 +107,11 @@ function manif.load_manifest(repo_url, lua_version)
    return manif.manifest_loader(pathname, repo_url, lua_version)
 end
 
+local function relative_path(from_dir, to_file)
+   -- It is assumed that `from_dir` is prefix of `to_file`.
+   return (to_file:sub(#from_dir + 1):gsub("^[\\/]*", ""))
+end
+
 local function find_providers(file, root)
    assert(type(file) == "string")
    root = root or cfg.root_dir
@@ -122,13 +127,13 @@ local function find_providers(file, root)
 
    if util.starts_with(file, deploy_lua) then
       manifest_tbl = manifest.modules
-      key = path.path_to_module(file:sub(#deploy_lua+1):gsub("\\", "/"))
+      key = path.path_to_module(relative_path(deploy_lua, file):gsub("\\", "/"))
    elseif util.starts_with(file, deploy_lib) then
       manifest_tbl = manifest.modules
-      key = path.path_to_module(file:sub(#deploy_lib+1):gsub("\\", "/"))
+      key = path.path_to_module(relative_path(deploy_lib, file):gsub("\\", "/"))
    elseif util.starts_with(file, deploy_bin) then
       manifest_tbl = manifest.commands
-      key = file:sub(#deploy_bin+1):gsub("^[\\/]*", "")
+      key = relative_path(deploy_bin, file)
    else
       assert(false, "Assertion failed: '"..file.."' is not a deployed file.")
    end