1 files changed, 21 insertions, 45 deletions
diff --git a/install.bat b/install.bat
index cc4a5257..1bce4c53 100644
--- a/install.bat
+++ b/install.bat
@@ -287,56 +287,32 @@ end
 -- ***********************************************************
 -- Detect Lua
 -- ***********************************************************
-local function look_for_interpreter (directory)
+local function look_for_interpreter(directory)
+        local names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe", "lua.exe", "luajit.exe"}
+        local directories
        if vars.LUA_BINDIR then
-        -- if LUA_BINDIR is specified, it must be there, otherwise we fail
+                -- If LUA_BINDIR is specified, look only in that directory.
-                if exists( S"$LUA_BINDIR\\lua$LUA_VERSION.exe" ) then
+                directories = {vars.LUA_BINDIR}
-                        vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe"
+        else
-                        print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
+                -- Try candidate directory and its `bin` subdirectory.
-                        return true
+                directories = {directory, directory .. "\\bin"}
-                elseif exists( S"$LUA_BINDIR\\lua$LUA_SHORTV.exe" ) then
-                        vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe"
-                        print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
-                        return true
-                elseif exists(S"$LUA_BINDIR\\lua.exe") then
-                        vars.LUA_INTERPRETER = "lua.exe"
-                        print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
-                        return true
-                elseif exists(S"$LUA_BINDIR\\luajit.exe") then
-                        vars.LUA_INTERPRETER = "luajit.exe"
-                        print(S"       Found $LUA_BINDIR\\$LUA_INTERPRETER")
-                        return true
-                end
-                die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")
        end
-        for _, e in ipairs{ [[\]], [[\bin\]] } do
+        for _, dir in ipairs(directories) do
-                if exists(directory..e.."\\lua"..vars.LUA_VERSION..".exe") then
+                for _, name in ipairs(names) do
-                        vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe"
+                        local full_name = dir .. "\\" .. name
-                        vars.LUA_BINDIR = directory .. e
+                        if exists(full_name) then
-                        print("       Found ."..e..vars.LUA_INTERPRETER)
+                                vars.LUA_INTERPRETER = name
-                        return true
+                                vars.LUA_BINDIR = dir
+                                print("       Found " .. full_name)
-                elseif exists(directory..e.."\\lua"..vars.LUA_SHORTV..".exe") then
+                                return true
-                        vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe"
+                        end
-                        vars.LUA_BINDIR = directory .. e
-                        print("       Found ."..e..vars.LUA_INTERPRETER)
-                        return true
-                elseif exists(directory..e.."\\lua.exe") then
-                        vars.LUA_INTERPRETER = "lua.exe"
-                        vars.LUA_BINDIR = directory..e
-                        print("       Found ."..e..vars.LUA_INTERPRETER)
-                        return true
-                elseif exists(directory..e.."\\luajit.exe") then
-                        vars.LUA_INTERPRETER = "luajit.exe"
-                        vars.LUA_BINDIR = directory..e
-                        print("       Found ."..e..vars.LUA_INTERPRETER)
-                        return true
                end
        end
-        --print("      No Lua interpreter found")
+        if vars.LUA_BINDIR then
+                die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")
+        end
        return false
 end

diff --git a/install.bat b/install.bat index cc4a5257..1bce4c53 100644 --- a/install.bat +++ b/install.bat
@@ -287,56 +287,32 @@ end
287	-- ***********************************************************	287	-- ***********************************************************
288	-- Detect Lua	288	-- Detect Lua
289	-- ***********************************************************	289	-- ***********************************************************
290	local function look_for_interpreter (directory)	290	local function look_for_interpreter(directory)
		291	local names = {S"lua$LUA_VERSION.exe", S"lua$LUA_SHORTV.exe", "lua.exe", "luajit.exe"}
		292	local directories
291	if vars.LUA_BINDIR then	293	if vars.LUA_BINDIR then
292	-- if LUA_BINDIR is specified, it must be there, otherwise we fail	294	-- If LUA_BINDIR is specified, look only in that directory.
293	if exists( S"$LUA_BINDIR\\lua$LUA_VERSION.exe" ) then	295	directories = {vars.LUA_BINDIR}
294	vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe"	296	else
295	print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER")	297	-- Try candidate directory and its `bin` subdirectory.
296	return true	298	directories = {directory, directory .. "\\bin"}
297	elseif exists( S"$LUA_BINDIR\\lua$LUA_SHORTV.exe" ) then
298	vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe"
299	print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER")
300	return true
301	elseif exists(S"$LUA_BINDIR\\lua.exe") then
302	vars.LUA_INTERPRETER = "lua.exe"
303	print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER")
304	return true
305	elseif exists(S"$LUA_BINDIR\\luajit.exe") then
306	vars.LUA_INTERPRETER = "luajit.exe"
307	print(S" Found $LUA_BINDIR\\$LUA_INTERPRETER")
308	return true
309	end
310	die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")
311	end	299	end
312		300
313	for _, e in ipairs{ [[\]], [[\bin\]] } do	301	for _, dir in ipairs(directories) do
314	if exists(directory..e.."\\lua"..vars.LUA_VERSION..".exe") then	302	for _, name in ipairs(names) do
315	vars.LUA_INTERPRETER = S"lua$LUA_VERSION.exe"	303	local full_name = dir .. "\\" .. name
316	vars.LUA_BINDIR = directory .. e	304	if exists(full_name) then
317	print(" Found ."..e..vars.LUA_INTERPRETER)	305	vars.LUA_INTERPRETER = name
318	return true	306	vars.LUA_BINDIR = dir
319		307	print(" Found " .. full_name)
320	elseif exists(directory..e.."\\lua"..vars.LUA_SHORTV..".exe") then	308	return true
321	vars.LUA_INTERPRETER = S"lua$LUA_SHORTV.exe"	309	end
322	vars.LUA_BINDIR = directory .. e
323	print(" Found ."..e..vars.LUA_INTERPRETER)
324	return true
325
326	elseif exists(directory..e.."\\lua.exe") then
327	vars.LUA_INTERPRETER = "lua.exe"
328	vars.LUA_BINDIR = directory..e
329	print(" Found ."..e..vars.LUA_INTERPRETER)
330	return true
331
332	elseif exists(directory..e.."\\luajit.exe") then
333	vars.LUA_INTERPRETER = "luajit.exe"
334	vars.LUA_BINDIR = directory..e
335	print(" Found ."..e..vars.LUA_INTERPRETER)
336	return true
337	end	310	end
338	end	311	end
339	--print(" No Lua interpreter found")	312
		313	if vars.LUA_BINDIR then
		314	die(S"Lua executable lua.exe, luajit.exe, lua$LUA_SHORTV.exe or lua$LUA_VERSION.exe not found in $LUA_BINDIR")
		315	end
340	return false	316	return false
341	end	317	end
342		318