Make sure package paths only reference current Lua version

4 files changed, 18 insertions, 12 deletions

diff --git a/src/luarocks/cmd/path.lua b/src/luarocks/cmd/path.lua
index 516a0c47..3cf43091 100644
--- a/src/luarocks/cmd/path.lua
+++ b/src/luarocks/cmd/path.lua
@@ -37,13 +37,13 @@ function path_cmd.command(flags)
    local path_sep = cfg.export_path_separator
 
    if flags["lr-path"] then
-      util.printout(util.remove_path_dupes(lr_path, ';'))
+      util.printout(util.cleanup_path(lr_path, ';', cfg.lua_version))
       return true
    elseif flags["lr-cpath"] then
-      util.printout(util.remove_path_dupes(lr_cpath, ';'))
+      util.printout(util.cleanup_path(lr_cpath, ';', cfg.lua_version))
       return true
    elseif flags["lr-bin"] then
-      util.printout(util.remove_path_dupes(lr_bin, path_sep))
+      util.printout(util.cleanup_path(lr_bin, path_sep))
       return true
    end
    
@@ -57,10 +57,10 @@ function path_cmd.command(flags)
       lr_bin = lr_bin .. path_sep .. os.getenv("PATH")
    end
 
-   util.printout(cfg.export_lua_path:format(util.remove_path_dupes(lr_path, ';')))
-   util.printout(cfg.export_lua_cpath:format(util.remove_path_dupes(lr_cpath, ';')))
+   util.printout(cfg.export_lua_path:format(util.cleanup_path(lr_path, ';', cfg.lua_version)))
+   util.printout(cfg.export_lua_cpath:format(util.cleanup_path(lr_cpath, ';', cfg.lua_version)))
    if flags["bin"] then
-      util.printout(cfg.export_path:format(util.remove_path_dupes(lr_bin, path_sep)))
+      util.printout(cfg.export_path:format(util.cleanup_path(lr_bin, path_sep)))
    end
    return true
 end
diff --git a/src/luarocks/core/cfg.lua b/src/luarocks/core/cfg.lua
index 250f503e..8c005aaa 100644
--- a/src/luarocks/core/cfg.lua
+++ b/src/luarocks/core/cfg.lua
@@ -731,8 +731,8 @@ end
 
 function cfg.init_package_paths()
    local lr_path, lr_cpath, lr_bin = cfg.package_paths()
-   package.path = util.remove_path_dupes(package.path .. ";" .. lr_path, ";")
-   package.cpath = util.remove_path_dupes(package.cpath .. ";" .. lr_cpath, ";")
+   package.path = util.cleanup_path(package.path .. ";" .. lr_path, ";", cfg.lua_version)
+   package.cpath = util.cleanup_path(package.cpath .. ";" .. lr_cpath, ";", cfg.lua_version)
 end
 
 function cfg.which_config()
diff --git a/src/luarocks/core/util.lua b/src/luarocks/core/util.lua
index 85b59af6..a025da7d 100644
--- a/src/luarocks/core/util.lua
+++ b/src/luarocks/core/util.lua
@@ -135,17 +135,23 @@ function util.deep_merge(dst, src)
    end
 end
 
---- Remove repeated entries from a path-style string.
+--- Clean up a path-style string ($PATH, $LUA_PATH/package.path, etc.),
+-- removing repeated entries and making sure only the relevant
+-- Lua version is used.
 -- Example: given ("a;b;c;a;b;d", ";"), returns "a;b;c;d".
 -- @param list string: A path string (from $PATH or package.path)
 -- @param sep string: The separator
-function util.remove_path_dupes(list, sep)
+-- @param lua_version (optional) string: The Lua version to use.
+function util.cleanup_path(list, sep, lua_version)
    assert(type(list) == "string")
    assert(type(sep) == "string")
    local parts = util.split_string(list, sep)
    local final, entries = {}, {}
    for _, part in ipairs(parts) do
       part = part:gsub("//", "/")
+      if lua_version then
+         part = part:gsub("/lua/[%d.]+/", "/lua/"..lua_version)
+      end
       if not entries[part] then
          table.insert(final, part)
          entries[part] = true
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 19c603dc..bd504fa7 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -141,8 +141,8 @@ function win32.wrap_script(file, dest, name, version)
    local wrapname = fs.is_dir(dest) and dest.."/"..base or dest
    wrapname = wrapname..".bat"
    local lpath, lcpath = cfg.package_paths()
-   lpath = util.remove_path_dupes(lpath, ";")
-   lcpath = util.remove_path_dupes(lcpath, ";")
+   lpath = util.cleanup_path(lpath, ";", cfg.lua_version)
+   lcpath = util.cleanup_path(lcpath, ";", cfg.lua_version)
    local wrapper = io.open(wrapname, "w")
    if not wrapper then
       return nil, "Could not open "..wrapname.." for writing."