16 files changed, 195 insertions, 53 deletions
diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index 30db9a48..d7c293e5 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -65,7 +65,7 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
   fs.change_dir(local_cache)
   util.printout("Updating manifest...")
-   manif.make_manifest(local_cache, "one")
+   manif.make_manifest(local_cache, "one", true)
   util.printout("Updating index.html...")
   index.make_index(local_cache)
@@ -76,6 +76,11 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
      login_url = login_url .. "/"
   end
+   table.insert(files, "index.html")
+   table.insert(files, "manifest")
+   table.insert(files, "manifest-5.1")
+   table.insert(files, "manifest-5.2")
   -- TODO abstract away explicit 'curl' call
   local cmd
@@ -84,9 +89,9 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
      cmd = cfg.variables.RSYNC.." --exclude=.git -Oavz -e ssh "..local_cache.."/ "..user.."@"..srv..":"..path.."/"
   elseif upload_server and upload_server.sftp then
      local part1, part2 = upload_server.sftp:match("^([^/]*)/(.*)$")
-      cmd = cfg.variables.SCP.." manifest index.html "..table.concat(files, " ").." "..user.."@"..part1..":/"..part2
+      cmd = cfg.variables.SCP.." "..table.concat(files, " ").." "..user.."@"..part1..":/"..part2
   else
-      cmd = cfg.variables.CURL.." "..login_info.." -T '{manifest,index.html,"..table.concat(files, ",").."}' "..login_url
+      cmd = cfg.variables.CURL.." "..login_info.." -T '{"..table.concat(files, ",").."}' "..login_url
   end
   util.printout(cmd)
diff --git a/src/luarocks/admin_remove.lua b/src/luarocks/admin_remove.lua
index c235776f..83b57fc9 100644
--- a/src/luarocks/admin_remove.lua
+++ b/src/luarocks/admin_remove.lua
@@ -61,7 +61,7 @@ local function remove_files_from_server(refresh, rockfiles, server, upload_serve
   fs.change_dir(local_cache)
   util.printout("Updating manifest...")
-   manif.make_manifest(local_cache, "one")
+   manif.make_manifest(local_cache, "one", true)
   util.printout("Updating index.html...")
   index.make_index(local_cache)
diff --git a/src/luarocks/build.lua b/src/luarocks/build.lua
index 83abbf8d..71b3cb89 100644
--- a/src/luarocks/build.lua
+++ b/src/luarocks/build.lua
@@ -111,8 +111,9 @@ end
 -- @param minimal_mode boolean: true if there's no need to fetch,
 -- unpack or change dir (this is used by "luarocks make"). Implies
 -- need_to_fetch = false.
-- @param deps_mode: string: Which trees to check dependencies for:
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
-- "none", "one", "order" or "all".
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for no trees.
 -- @return boolean or (nil, string, [string]): True if succeeded or 
 -- nil and an error message followed by an error code.
 function build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_mode)
@@ -196,6 +197,10 @@ function build_rockspec(rockspec_file, need_to_fetch, minimal_mode, deps_mode)
         build.type = "builtin"
      end
+      if cfg.accepted_build_types and util.array_contains(cfg.accepted_build_types, build.type) then
+         return nil, "This rockspec uses the '"..build.type.."' build type, which is blocked by the 'accepted_build_types' setting in your LuaRocks configuration."
+      end
      local build_type
      ok, build_type = pcall(require, "luarocks.build." .. build.type)
      if not ok or not type(build_type) == "table" then
@@ -275,7 +280,8 @@ end
 -- @param need_to_fetch boolean: true if sources need to be fetched,
 -- false if the rockspec was obtained from inside a source rock.
 -- @param deps_mode: string: Which trees to check dependencies for:
-- "none", "one", "order" or "all".
+-- "one" for the current default tree, "all" for all trees,
+-- "order" for all trees with priority >= the current default, "none" for no trees.
 -- @return boolean or (nil, string, [string]): True if build was successful,
 -- or false and an error message and an optional error code.
 function build_rock(rock_file, need_to_fetch, deps_mode)
diff --git a/src/luarocks/cfg.lua b/src/luarocks/cfg.lua
index f3cbe1fb..5d918b13 100644
--- a/src/luarocks/cfg.lua
+++ b/src/luarocks/cfg.lua
@@ -30,7 +30,7 @@ end
 _M.site_config = site_config
-program_version = "2.0.13"
+program_version = "2.1.0"
 local persist = require("luarocks.persist")
@@ -137,13 +137,13 @@ if not site_config.LUAROCKS_FORCE_CONFIG then
   local home_overrides, err
   home_config_file = os.getenv("LUAROCKS_CONFIG_" .. version_suffix) or os.getenv("LUAROCKS_CONFIG")
   if home_config_file then
-      home_overrides, err = persist.load_into_table(home_config_file, { home = home })
+      home_overrides, err = persist.load_into_table(home_config_file, { home = home, lua_version = lua_version })
   else
      home_config_file = home_config_dir.."/config-"..lua_version..".lua"
-      home_overrides, err = persist.load_into_table(home_config_file, { home = home })
+      home_overrides, err = persist.load_into_table(home_config_file, { home = home, lua_version = lua_version })
      if not home_overrides then
         home_config_file = home_config_dir.."/config.lua"
-         home_overrides, err = persist.load_into_table(home_config_file, { home = home })
+         home_overrides, err = persist.load_into_table(home_config_file, { home = home, lua_version = lua_version })
      end
   end
   if home_overrides then
@@ -182,6 +182,7 @@ local defaults = {
   use_extensions = false,
   accept_unknown_fields = false,
   fs_use_modules = true,
+   hooks_enabled = true,
   deps_mode = "one",
   lua_modules_path = "/share/lua/"..lua_version,
@@ -305,7 +306,7 @@ if detected.windows then
 end
 if detected.mingw32 then
-   defaults.platforms = { "win32", "mingw32" }
+   defaults.platforms = { "win32", "mingw32", "windows" }
   defaults.obj_extension = "o"
   defaults.cmake_generator = "MinGW Makefiles"
   defaults.variables.MAKE = "mingw32-make"
@@ -442,15 +443,25 @@ local cfg_mt = {
 }
 setmetatable(_M, cfg_mt)
-for _,tree in ipairs(rocks_trees) do
+function package_paths()
-  if type(tree) == "string" then
+   local new_path, new_cpath = {}, {}
-    package.path = tree..lua_modules_path.."/?.lua;"..tree..lua_modules_path.."/?/init.lua;"..package.path
+   for _,tree in ipairs(rocks_trees) do
-    package.cpath = tree..lib_modules_path.."/?."..lib_extension..";"..package.cpath
+     if type(tree) == "string" then
-  else
+        table.insert(new_path, 1, tree..lua_modules_path.."/?.lua;"..tree..lua_modules_path.."/?/init.lua")
-    package.path = (tree.lua_dir or tree.root..lua_modules_path).."/?.lua;"..
+        table.insert(new_cpath, 1, tree..lib_modules_path.."/?."..lib_extension)
-                       (tree.lua_dir or tree.root..lua_modules_path).."/?/init.lua;"..package.path
+     else
-    package.cpath = (tree.lib_dir or tree.root..lib_modules_path).."/?."..lib_extension..";"..package.cpath
+        table.insert(new_path, 1, (tree.lua_dir or tree.root..lua_modules_path).."/?.lua;"..
-  end
+           (tree.lua_dir or tree.root..lua_modules_path).."/?/init.lua")
+        table.insert(new_cpath, 1, (tree.lib_dir or tree.root..lib_modules_path).."/?."..lib_extension)
+     end
+   end
+   return table.concat(new_path, ";"), table.concat(new_cpath, ";")
+end
+do
+   local new_path, new_cpath = package_paths()
+   package.path = new_path..";"..package.path
+   package.cpath = new_cpath..";"..package.cpath
 end
 function which_config()
diff --git a/src/luarocks/fs/unix.lua b/src/luarocks/fs/unix.lua
index cfd20c70..cccbbd33 100644
--- a/src/luarocks/fs/unix.lua
+++ b/src/luarocks/fs/unix.lua
@@ -43,9 +43,11 @@ end
 --- Create a wrapper to make a script executable from the command-line.
 -- @param file string: Pathname of script to be made executable.
 -- @param dest string: Directory where to put the wrapper.
+-- @param name string: rock name to be used in loader context.
+-- @param version string: rock version to be used in loader context.
 -- @return boolean or (nil, string): True if succeeded, or nil and
 -- an error message.
-function wrap_script(file, dest)
+function wrap_script(file, dest, name, version)
   assert(type(file) == "string")
   assert(type(dest) == "string")
   
@@ -59,7 +61,7 @@ function wrap_script(file, dest)
   wrapper:write('LUA_PATH="'..package.path..';$LUA_PATH"\n')
   wrapper:write('LUA_CPATH="'..package.cpath..';$LUA_CPATH"\n')
   wrapper:write('export LUA_PATH LUA_CPATH\n')
-   wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader "'..file..'" "$@"\n')
+   wrapper:write('exec "'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" "$@"\n')
   wrapper:close()
   if fs.chmod(wrapname, "0755") then
      return true
diff --git a/src/luarocks/fs/win32.lua b/src/luarocks/fs/win32.lua
index 2c78d9b6..2b5bb955 100644
--- a/src/luarocks/fs/win32.lua
+++ b/src/luarocks/fs/win32.lua
@@ -52,9 +52,11 @@ end
 --- Create a wrapper to make a script executable from the command-line.
 -- @param file string: Pathname of script to be made executable.
 -- @param dest string: Directory where to put the wrapper.
+-- @param name string: rock name to be used in loader context.
+-- @param version string: rock version to be used in loader context.
 -- @return boolean or (nil, string): True if succeeded, or nil and
 -- an error message.
-function wrap_script(file, dest)
+function wrap_script(file, dest, name, version)
   assert(type(file) == "string")
   assert(type(dest) == "string")
@@ -69,7 +71,7 @@ function wrap_script(file, dest)
   wrapper:write("setlocal\n")
   wrapper:write('set LUA_PATH='..package.path..";%LUA_PATH%\n")
   wrapper:write('set LUA_CPATH='..package.cpath..";%LUA_CPATH%\n")
-   wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader "'..file..'" %*\n')
+   wrapper:write('"'..dir.path(cfg.variables["LUA_BINDIR"], cfg.lua_interpreter)..'" -lluarocks.loader -e\'luarocks.loader.add_context([['..name..']],[['..version..']])\' "'..file..'" %*\n')
   wrapper:write("endlocal\n")
   wrapper:close()
   return true
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index 033f71be..1af1dd91 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -146,7 +146,7 @@ end
 -- plus an error message.
 function copy_contents(src, dest)
   assert(src and dest)
-   if fs.execute_string(fs.quiet(vars.CP.." -a "..src.."\\*.* "..fs.Q(dest))) then
+   if fs.execute_string(fs.quiet(vars.CP.." -dR "..src.."\\*.* "..fs.Q(dest))) then
      return true
   else
      return false, "Failed copying "..src.." to "..dest
diff --git a/src/luarocks/install.lua b/src/luarocks/install.lua
index c2a54482..3960dcb8 100644
--- a/src/luarocks/install.lua
+++ b/src/luarocks/install.lua
@@ -24,7 +24,8 @@ or a filename of a locally available rock.
 --- Install a binary rock.
 -- @param rock_file string: local or remote filename of a rock.
 -- @param deps_mode: string: Which trees to check dependencies for:
-- "none", "one", "order" or "all". 
+-- "one" for the current default tree, "all" for all trees,
+-- "order" for all trees with priority >= the current default, "none" for no trees.
 -- @return boolean or (nil, string, [string]): True if succeeded or 
 -- nil and an error message and an optional error code.
 function install_binary_rock(rock_file, deps_mode)
diff --git a/src/luarocks/make_manifest.lua b/src/luarocks/make_manifest.lua
index 845c9f8a..f793dcf2 100644
--- a/src/luarocks/make_manifest.lua
+++ b/src/luarocks/make_manifest.lua
@@ -28,7 +28,7 @@ function run(...)
  
   util.printout("Making manifest for "..repo)
   
-   local ok, err = manif.make_manifest(repo, deps.get_deps_mode(flags))
+   local ok, err = manif.make_manifest(repo, deps.get_deps_mode(flags), true)
   if ok then
      util.printout("Generating index.html for "..repo)
      index.make_index(repo)
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index 414c3262..c17da71e 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -81,6 +81,16 @@ function make_rock_manifest(name, version)
   save_table(install_dir, "rock_manifest", rock_manifest )
 end
+local function fetch_manifest_from(repo_url, filename)
+   local url = dir.path(repo_url, filename)
+   local name = repo_url:gsub("[/:]","_")
+   local file, err, errcode = fetch.fetch_url_at_temp_dir(url, "luarocks-manifest-"..name)
+   if not file then
+      return nil, "Failed fetching manifest for "..repo_url..(err and " - "..err or ""), errcode
+   end
+   return file
+end
 --- Load a local or remote manifest describing a repository.
 -- All functions that use manifest tables assume they were obtained
 -- through either this function or load_local_manifest.
@@ -94,15 +104,23 @@ function load_manifest(repo_url)
      return manif_core.manifest_cache[repo_url]
   end
+   local vmanifest = "manifest-"..cfg.lua_version
   local protocol, pathname = dir.split_url(repo_url)
   if protocol == "file" then
-      pathname = dir.path(pathname, "manifest")
+      local file = dir.path(pathname, vmanifest)
+      if fs.exists(file) then
+         pathname = file
+      else
+         pathname = dir.path(pathname, "manifest")
+      end
   else
-      local url = dir.path(repo_url, "manifest")
+      local file, err = fetch_manifest_from(repo_url, vmanifest)
-      local name = repo_url:gsub("[/:]","_")
-      local file, err, errcode = fetch.fetch_url_at_temp_dir(url, "luarocks-manifest-"..name)
      if not file then
-         return nil, "Failed fetching manifest for "..repo_url..(err and " - "..err or ""), errcode
+         file, err = fetch_manifest_from(repo_url, "manifest")
+      end
+      if not file then 
+         return nil, err
      end
      pathname = file
   end
@@ -185,11 +203,21 @@ end
 -- and any dependency inconsistencies or missing dependencies are reported to
 -- standard error.
 -- @param manifest table: a manifest table.
-local function update_dependencies(manifest, deps_mode)
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for no trees.
+-- @param repodir string: directory of repository being scanned
+-- @param filter_lua string or nil: filter by Lua version
+-- @param cache table: temporary rockspec cache table
+local function update_dependencies(manifest, deps_mode, repodir, filter_lua, cache)
   assert(type(manifest) == "table")
   assert(type(deps_mode) == "string")
+   
+   cache = cache or {}
+   local lua_version = filter_lua and deps.parse_version(filter_lua)
+   
   for pkg, versions in pairs(manifest.repository) do
+      local to_remove = {}
      for version, repositories in pairs(versions) do
         local current = pkg.." "..version
         for _, repo in ipairs(repositories) do
@@ -206,9 +234,36 @@ local function update_dependencies(manifest, deps_mode)
                     end
                  end
               end
+            elseif filter_lua and repo.arch == "rockspec" then
+               local pathname = dir.path(repodir, pkg.."-"..version..".rockspec")
+               local rockspec, err = cache[pathname]
+               if not rockspec then
+                  rockspec, err = fetch.load_local_rockspec(pathname)
+               end
+               if rockspec then
+                  cache[pathname] = rockspec
+                  for _, dep in ipairs(rockspec.dependencies) do
+                     if dep.name == "lua" then 
+                        if not deps.match_constraints(lua_version, dep.constraints) then
+                           table.insert(to_remove, version)
+                        end
+                        break
+                     end
+                  end
+               else
+                  util.printerr("Error loading rockspec for "..pkg.." "..version..": "..err)
+               end
            end
         end
      end
+      if next(to_remove) then
+         for _, incompat in ipairs(to_remove) do
+            manifest.repository[pkg][incompat] = nil
+         end
+         if not next(manifest.repository[pkg]) then
+            manifest.repository[pkg] = nil
+         end
+      end
   end
 end
@@ -216,8 +271,14 @@ end
 -- @param results table: The search results as returned by search.disk_search.
 -- @param manifest table: A manifest table (must contain repository, modules, commands tables).
 -- It will be altered to include the search results.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for no trees.
+-- @param repo string: directory of repository
+-- @param filter_lua string or nil: filter by Lua version
+-- @param cache table: temporary rockspec cache table
 -- @return boolean or (nil, string): true in case of success, or nil followed by an error message.
-local function store_results(results, manifest, deps_mode)
+local function store_results(results, manifest, deps_mode, repo, filter_lua, cache)
   assert(type(results) == "table")
   assert(type(manifest) == "table")
   assert(type(deps_mode) == "string")
@@ -243,7 +304,7 @@ local function store_results(results, manifest, deps_mode)
      end
      manifest.repository[name] = pkgtable
   end
-   update_dependencies(manifest, deps_mode)
+   update_dependencies(manifest, deps_mode, repo, filter_lua, cache)
   sort_package_matching_table(manifest.modules)
   sort_package_matching_table(manifest.commands)
   return true
@@ -253,9 +314,13 @@ end
 -- A file called 'manifest' will be written in the root of the given
 -- repository directory.
 -- @param repo A local repository directory.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for the default dependency mode from the configuration.
+-- @param versioned boolean: if versioned versions of the manifest should be created.
 -- @return boolean or (nil, string): True if manifest was generated,
 -- or nil and an error message.
-function make_manifest(repo, deps_mode)
+function make_manifest(repo, deps_mode, versioned)
   assert(type(repo) == "string")
   assert(type(deps_mode) == "string")
@@ -270,11 +335,21 @@ function make_manifest(repo, deps_mode)
   query.arch = "any"
   local results = search.disk_search(repo, query)
   local manifest = { repository = {}, modules = {}, commands = {} }
   manif_core.manifest_cache[repo] = manifest
-   local ok, err = store_results(results, manifest, deps_mode)
+   local cache = {}
+   local ok, err = store_results(results, manifest, deps_mode, repo, nil, cache)
   if not ok then return nil, err end
+   if versioned then
+      for _, luaver in ipairs({"5.1", "5.2"}) do
+         local vmanifest = { repository = {}, modules = {}, commands = {} }
+         local ok, err = store_results(results, vmanifest, deps_mode, repo, luaver, cache)
+         save_table(repo, "manifest-"..luaver, vmanifest)
+      end
+   end
   return save_table(repo, "manifest", manifest)
 end
@@ -286,6 +361,9 @@ end
 -- @param version string: Version of a package from the repository.
 -- @param repo string or nil: Pathname of a local repository. If not given,
 -- the default local repository configured as cfg.rocks_dir is used.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for using the default dependency mode from the configuration.
 -- @return boolean or (nil, string): True if manifest was generated,
 -- or nil and an error message.
 function update_manifest(name, version, repo, deps_mode)
@@ -313,7 +391,7 @@ function update_manifest(name, version, repo, deps_mode)
   local results = {[name] = {[version] = {{arch = "installed", repo = repo}}}}
-   local ok, err = store_results(results, manifest, deps_mode)
+   local ok, err = store_results(results, manifest, deps_mode, repo)
   if not ok then return nil, err end
   return save_table(repo, "manifest", manifest)
diff --git a/src/luarocks/path.lua b/src/luarocks/path.lua
index 5e380992..7af81c07 100644
--- a/src/luarocks/path.lua
+++ b/src/luarocks/path.lua
@@ -313,6 +313,13 @@ function use_tree(tree)
   cfg.deploy_lib_dir = deploy_lib_dir(tree)
 end
+--- Apply a given function to the active rocks trees based on chosen dependency mode.
+-- @param deps_mode string: Dependency mode: "one" for the current default tree,
+-- "all" for all trees, "order" for all trees with priority >= the current default,
+-- "none" for no trees (this function becomes a nop).
+-- @param fn function: function to be applied, with the tree dir (string) as the first
+-- argument and the remaining varargs of map_trees as the following arguments.
+-- @return a table with all results of invocations of fn collected.
 function map_trees(deps_mode, fn, ...)
   local result = {}
   if deps_mode == "one" then
@@ -382,13 +389,28 @@ end
 function run(...)
   local flags = util.parse_flags(...)
   local deps_mode = deps.get_deps_mode(flags)
+   
+   local lr_path, lr_cpath = cfg.package_paths()
+   local bin_dirs = map_trees(deps_mode, deploy_bin_dir)
+   if flags["lr-path"] then
+      util.printout(util.remove_path_dupes(lr_path, ';'))
+      return true
+   elseif flags["lr-cpath"] then
+      util.printout(util.remove_path_dupes(lr_cpath, ';'))
+      return true
+   elseif flags["lr-bin"] then
+      local lr_bin = util.remove_path_dupes(table.concat(bin_dirs, cfg.export_path_separator), cfg.export_path_separator)
+      util.printout(util.remove_path_dupes(lr_bin, ';'))
+      return true
+   end
   util.printout(cfg.export_lua_path:format(util.remove_path_dupes(package.path, ';')))
   util.printout(cfg.export_lua_cpath:format(util.remove_path_dupes(package.cpath, ';')))
   if flags["bin"] then
-      local bin_dirs = map_trees(deps_mode, deploy_bin_dir)
      table.insert(bin_dirs, 1, os.getenv("PATH"))
-      util.printout(cfg.export_path:format(util.remove_path_dupes(table.concat(bin_dirs, cfg.export_path_separator), cfg.export_path_separator)))
+      local lr_bin = util.remove_path_dupes(table.concat(bin_dirs, cfg.export_path_separator), cfg.export_path_separator)
+      util.printout(cfg.export_path:format(lr_bin))
   end
   return true
 end
diff --git a/src/luarocks/purge.lua b/src/luarocks/purge.lua
index 6b094061..46a023e9 100644
--- a/src/luarocks/purge.lua
+++ b/src/luarocks/purge.lua
@@ -44,5 +44,5 @@ function run(...)
         end
      end
   end
-   return manif.make_manifest(cfg.rocks_dir, "one")
+   return manif.make_manifest(cfg.rocks_dir, "one", true)
 end
diff --git a/src/luarocks/repos.lua b/src/luarocks/repos.lua
index dc1b63c8..b7e64d42 100644
--- a/src/luarocks/repos.lua
+++ b/src/luarocks/repos.lua
@@ -131,6 +131,11 @@ function run_hook(rockspec, hook_name)
   if not hooks then
      return true
   end
+   
+   if cfg.hooks_enabled == false then
+      return nil, "This rockspec contains hooks, which are blocked by the 'hooks_enabled' setting in your LuaRocks configuration."
+   end
+   
   if not hooks.substituted_variables then
      util.variable_substitutions(hooks, rockspec.variables)
      hooks.substituted_variables = true
@@ -145,7 +150,7 @@ function run_hook(rockspec, hook_name)
   return true
 end
-local function install_binary(source, target)
+local function install_binary(source, target, name, version)
   assert(type(source) == "string")
   assert(type(target) == "string")
@@ -155,7 +160,7 @@ local function install_binary(source, target)
      file = io.open(source)
   end
   if match or (file and file:read():match("^#!.*lua.*")) then
-      ok, err = fs.wrap_script(source, target)
+      ok, err = fs.wrap_script(source, target, name, version)
   else
      ok, err = fs.copy_binary(source, target)
   end
@@ -195,7 +200,8 @@ function deploy_files(name, version, wrap_bin_scripts)
   assert(type(version) == "string")
   assert(type(wrap_bin_scripts) == "boolean")
-   local function deploy_file_tree(file_tree, source_dir, deploy_dir, move_fn)
+   local function deploy_file_tree(file_tree, path_fn, deploy_dir, move_fn)
+      local source_dir = path_fn(name, version)
      if not move_fn then
         move_fn = fs.move
      end
@@ -215,7 +221,7 @@ function deploy_files(name, version, wrap_bin_scripts)
               end
            end
            fs.make_dir(dir.dir_name(target))
-            ok, err = move_fn(source, target)
+            ok, err = move_fn(source, target, name, version)
            fs.remove_dir_tree_if_empty(dir.dir_name(source))
            if not ok then return nil, err end
            return true
@@ -228,13 +234,13 @@ function deploy_files(name, version, wrap_bin_scripts)
   local ok, err = true
   if rock_manifest.bin then
      local move_bin_fn = wrap_bin_scripts and install_binary or fs.copy_binary
-      ok, err = deploy_file_tree(rock_manifest.bin, path.bin_dir(name, version), cfg.deploy_bin_dir, move_bin_fn)
+      ok, err = deploy_file_tree(rock_manifest.bin, path.bin_dir, cfg.deploy_bin_dir, move_bin_fn)
   end
   if ok and rock_manifest.lua then
-      ok, err = deploy_file_tree(rock_manifest.lua, path.lua_dir(name, version), cfg.deploy_lua_dir)
+      ok, err = deploy_file_tree(rock_manifest.lua, path.lua_dir, cfg.deploy_lua_dir)
   end
   if ok and rock_manifest.lib then
-      ok, err = deploy_file_tree(rock_manifest.lib, path.lib_dir(name, version), cfg.deploy_lib_dir)
+      ok, err = deploy_file_tree(rock_manifest.lib, path.lib_dir, cfg.deploy_lib_dir)
   end
   return ok, err
 end
diff --git a/src/luarocks/tools/patch.lua b/src/luarocks/tools/patch.lua
index 04154219..baaacfc1 100644
--- a/src/luarocks/tools/patch.lua
+++ b/src/luarocks/tools/patch.lua
@@ -95,7 +95,7 @@ local function string_as_file(s)
      eof = false,
      read = function(self, n)
         if self.eof then return nil end
-         local chunk = self.str:sub(self.at, self.at+n)
+         local chunk = self.str:sub(self.at, self.at + n - 1)
         self.at = self.at + n
         if self.at > self.len then
            self.eof = true
diff --git a/src/luarocks/unpack.lua b/src/luarocks/unpack.lua
index 1db66bbb..67153812 100644
--- a/src/luarocks/unpack.lua
+++ b/src/luarocks/unpack.lua
@@ -26,7 +26,7 @@ In the latter case, the app version may be given as a second argument.
 local function unpack_rockspec(rockspec_file, dir_name)
   assert(type(rockspec_file) == "string")
   assert(type(dir_name) == "string")
-   
   local rockspec, err = fetch.load_rockspec(rockspec_file)
   if not rockspec then
      return nil, "Failed loading rockspec "..rockspec_file..": "..err
@@ -52,7 +52,7 @@ end
 local function unpack_rock(rock_file, dir_name, kind)
   assert(type(rock_file) == "string")
   assert(type(dir_name) == "string")
-   
   local ok, err, errcode = fetch.fetch_and_unpack_rock(rock_file, dir_name)
   if not ok then
      return nil, "Failed unzipping rock "..rock_file, errcode
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index c5095675..b2428f62 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -461,3 +461,12 @@ function show_table(t, name, indent)
   addtocart(t, name, indent)
   return cart .. autoref
 end
+function array_contains(tbl, value)
+   for _, v in ipairs(tbl) do
+      if v == value then
+         return true
+      end
+   end
+   return false
+end