update handling of version-specific LUA_PATH / LUA_CPATH

Support Lua 5.4 and 5.5,
see https://github.com/luarocks/luarocks/pull/1832

2 files changed, 10 insertions, 0 deletions

diff --git a/install.bat b/install.bat
index 6dd71125..5210a862 100644
--- a/install.bat
+++ b/install.bat
@@ -1058,6 +1058,12 @@ IF NOT "%LUA_PATH_5_2%"=="" (
 IF NOT "%LUA_PATH_5_3%"=="" (

    SET "LUA_PATH_5_3=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_3%"

 )

+IF NOT "%LUA_PATH_5_4%"=="" (

+   SET "LUA_PATH_5_4=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_4%"

+)

+IF NOT "%LUA_PATH_5_5%"=="" (

+   SET "LUA_PATH_5_5=$LUADIR\?.lua;$LUADIR\?\init.lua;%LUA_PATH_5_5%"

+)

 SET "PATH=$BINDIR;%PATH%"

 "$LUA" "$BINDIR\]]..c..[[.lua" %*

 SET EXITCODE=%ERRORLEVEL%

diff --git a/spec/util/test_env.lua b/spec/util/test_env.lua
index 390ba01c..4b359b7f 100644
--- a/spec/util/test_env.lua
+++ b/spec/util/test_env.lua
@@ -250,6 +250,10 @@ function test_env.execute_helper(command, print_command, env_variables)
       "LUA_CPATH_5_2",
       "LUA_PATH_5_3",
       "LUA_CPATH_5_3",
+      "LUA_PATH_5_4",
+      "LUA_CPATH_5_4",
+      "LUA_PATH_5_5",
+      "LUA_CPATH_5_5",
       "LUAROCKS_SYSCONFDIR",
    }