From 86667c1ca3b5248404c2a150f7ed1ce93f545cf2 Mon Sep 17 00:00:00 2001 From: Hisham Muhammad Date: Mon, 13 May 2024 19:16:24 -0300 Subject: install.bat: always set LUA_DIR if Lua install is found Closes #1671. --- install.bat | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/install.bat b/install.bat index b957299f..016eddaf 100644 --- a/install.bat +++ b/install.bat @@ -634,6 +634,14 @@ local function get_possible_lua_directories() return directories end +local function strip_bin(bindir) + bindir = bindir:gsub("[/\\]*$", "") + if bindir:upper():match("[/\\]BIN") then + bindir = bindir:sub(1, -5):gsub("[/\\]*$", "") + end + return bindir +end + local function look_for_lua_install () print("Looking for Lua interpreter") if vars.LUA_BINDIR and vars.LUA_LIBDIR and vars.LUA_INCDIR then @@ -643,6 +651,7 @@ local function look_for_lua_install () then if get_runtime() then print("Runtime check completed.") + vars.LUA_DIR = vars.LUA_PREFIX or strip_bin(vars.LUA_BINDIR) return true end end -- cgit v1.2.3-55-g6feb