Merge branch 'master' into luarocks-3

6 files changed, 16 insertions, 8 deletions

diff --git a/.travis.yml b/.travis.yml
index 4f32d3a2..e651cb98 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ matrix:
 
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; brew install python; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update;fi
   - pip install hererocks
   - hererocks lua_install --luarocks @luarocks-3 --$LUA
   - export PATH=$PATH:$PWD/lua_install/bin # Add directory with all installed binaries to PATH
diff --git a/configure b/configure
index 665d52bc..3636aed3 100755
--- a/configure
+++ b/configure
@@ -226,8 +226,8 @@ then
 fi
 
 detect_lua_version() {
-   detected_lua=`$1 -e 'print(_VERSION:sub(5))' 2> /dev/null`
-   if [ "$detected_lua" = "5.1" -o "$detected_lua" = "5.2" -o "$detected_lua" = "5.3" ]
+   detected_lua=`$1 -e 'print(_VERSION:match(" (5%.[123])$"))' 2> /dev/null`
+   if [ "$detected_lua" != "nil" ]
    then
       echo "Lua version detected: $detected_lua"
       if [ "$LUA_VERSION_SET" != "yes" ]
diff --git a/install.bat b/install.bat
index 7c0f8b73..ddbc39c2 100644
--- a/install.bat
+++ b/install.bat
@@ -262,7 +262,7 @@ local function detect_lua_version(interpreter_path)
         local full_version = handler:read("*a")

         handler:close()

 

-        local version = full_version:match("^Lua (5%.[123])$")

+        local version = full_version:match(" (5%.[123])$")

         if not version then

                 return nil, "unknown interpreter version '" .. full_version .. "'"

         end

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
diff --git a/test/test_environment.lua b/test/test_environment.lua
index 799e13ec..f04c22b8 100644
--- a/test/test_environment.lua
+++ b/test/test_environment.lua
@@ -202,6 +202,9 @@ function test_env.set_args()
 
       if execute_bool("sw_vers") then 
          test_env.TEST_TARGET_OS = "osx"
+         if test_env.TRAVIS then
+            test_env.OPENSSL_DIRS = "OPENSSL_LIBDIR=/usr/local/opt/openssl/lib OPENSSL_INCDIR=/usr/local/opt/openssl/include"
+         end
       elseif execute_output("uname -s") == "Linux" then
          test_env.TEST_TARGET_OS = "linux"
       else