From b51e98582dd8b59a15bd0dcbf469c05d01c3e045 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Wed, 20 Jun 2018 14:20:54 -0300
Subject: cmd: ensure that found Lua matches version requested with
 --lua-version

---
 src/luarocks/cmd.lua | 50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)

diff --git a/src/luarocks/cmd.lua b/src/luarocks/cmd.lua
index 6ce9a8b5..da78c224 100644
--- a/src/luarocks/cmd.lua
+++ b/src/luarocks/cmd.lua
@@ -35,20 +35,6 @@ local function is_ownership_ok(directory)
 end
 
 do
-   local function check_lua_version(lua_exe, luaver)
-      local luajitver
-      if not (luaver and luaver:match("^[0-9]")) then
-         luaver = util.popen_read(lua_exe .. ' -e "io.write(_VERSION:sub(5))"')
-      end
-      if luaver == "5.1" then
-         luajitver = util.popen_read(lua_exe .. ' -e "io.write(tostring(jit and jit.version:sub(8)))"')
-         if luajitver == "nil" then
-            luajitver = nil
-         end
-      end
-      return luaver, luajitver
-   end
-
    local function exists(file)
       local fd = io.open(file, "r")
       if fd then
@@ -58,6 +44,24 @@ do
       return false
    end
 
+   local function check_lua_version(lua_exe, luaver)
+      if not exists(lua_exe) then
+         return nil
+      end
+      local lv = util.popen_read(lua_exe .. ' -e "io.write(_VERSION:sub(5))"')
+      if luaver and luaver ~= lv then
+         return nil
+      end
+      local ljv
+      if lv == "5.1" then
+         ljv = util.popen_read(lua_exe .. ' -e "io.write(tostring(jit and jit.version:sub(8)))"')
+         if ljv == "nil" then
+            ljv = nil
+         end
+      end
+      return lv, ljv
+   end
+
    local find_lua_bindir
    do
       local exe_suffix = (package.config:sub(1, 1) == "\\" and ".exe" or "")
@@ -93,8 +97,9 @@ do
             for _, name in ipairs(names) do
                local lua_exe = dir.path(d, name)
                table.insert(tried, lua_exe)
-               if exists(lua_exe) then
-                  return name, d, luaver
+               local lv, ljv = check_lua_version(lua_exe, luaver)
+               if lv then
+                  return name, d, lv, ljv
                end
             end
          end
@@ -115,6 +120,7 @@ do
 
       for _, d in ipairs(incdirs) do
          local lua_h = dir.path(d, "lua.h")
+         -- TODO check that LUA_VERSION_MAJOR and LUA_VERSION_MINOR match luaver
          if exists(lua_h) then
             return d
          end
@@ -124,17 +130,13 @@ do
       return incdirs[1]
    end
 
-   find_lua = function(prefix, luaver)
-      local lua_interpreter, bindir
-      lua_interpreter, bindir, luaver = find_lua_bindir(prefix, luaver)
+   function cmd.find_lua(prefix, luaver)
+      local lua_interpreter, bindir, luajitver
+      lua_interpreter, bindir, luaver, luajitver = find_lua_bindir(prefix, luaver)
       if not lua_interpreter then
          return nil, bindir
       end
 
-      local luajitver
-      local lua_exe = dir.path(bindir, lua_interpreter)
-      luaver, luajitver = check_lua_version(lua_exe, luaver)
-
       return {
          lua_version = luaver,
          luajit_version = luajitver,
@@ -367,7 +369,7 @@ function cmd.run_command(description, commands, ...)
 
    local lua_data
    if flags["lua-dir"] then
-      lua_data = find_lua(flags["lua-dir"], flags["lua-version"])
+      lua_data = cmd.find_lua(flags["lua-dir"], flags["lua-version"])
    end
 
    -----------------------------------------------------------------------------
-- 
cgit v1.2.3-55-g6feb