From e45f2a6bb460d0690722e862152a274ada15d300 Mon Sep 17 00:00:00 2001 From: Geoff Leyland Date: Wed, 23 Dec 2015 09:43:43 +1300 Subject: If source.dir can't be found in a downloaded package in fetch.get_sources, but we find that the package only contains one directory, then use that directory. This helps for downloads from bitbucket, where the top-level directory of a zip download of master has a commit hash in its name. --- src/luarocks/fetch.lua | 27 ++++++++++++++++++++++++++- 1 file changed, 26 insertions(+), 1 deletion(-) (limited to 'src') diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua index e1cad11b..ef478658 100644 --- a/src/luarocks/fetch.lua +++ b/src/luarocks/fetch.lua @@ -355,7 +355,32 @@ function fetch.get_sources(rockspec, extract, dest_dir) if not ok then return nil, err end fs.unpack_archive(rockspec.source.file) if not fs.exists(rockspec.source.dir) then - return nil, "Directory "..rockspec.source.dir.." not found inside archive "..rockspec.source.file, "source.dir", source_file, store_dir + + -- if rockspec.source.dir can't be found, see if we only have one + -- directory in store_dir. If that's the case, assume it's what + -- we're looking for. + -- Ideally, we'd only do this if rockspec.source.dir was not + -- defined in the rockspec, but load_local_repository already + -- set it to an inferred value if it wasn't set there, so we + -- can't tell its status in the rockspec. + -- In any case, we only do this with rockspecs newer than 3.0. + local dir_count, found_dir = 0 + + if deps.format_is_at_least(rockspec, "3.0") then + local files = fs.list_dir() + for _, f in ipairs(files) do + if fs.is_dir(f) then + dir_count = dir_count + 1 + found_dir = f + end + end + end + + if dir_count == 1 then + rockspec.source.dir = found_dir + else + return nil, "Directory "..rockspec.source.dir.." not found inside archive "..rockspec.source.file, "source.dir", source_file, store_dir + end end fs.pop_dir() end -- cgit v1.2.3-55-g6feb From 7590c40d647d130e9005f6efc10ab62f7e388e4b Mon Sep 17 00:00:00 2001 From: Geoff Leyland Date: Wed, 23 Dec 2015 21:54:34 +1300 Subject: fetch.get_sources only searches the directory for the one true dir if the rockspec's source.dir was not set --- src/luarocks/fetch.lua | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua index ef478658..039efeea 100644 --- a/src/luarocks/fetch.lua +++ b/src/luarocks/fetch.lua @@ -245,6 +245,7 @@ function fetch.load_local_rockspec(filename, quick) rockspec.local_filename = filename local filebase = rockspec.source.file or rockspec.source.url local base = fetch.url_to_base_dir(filebase) + rockspec.source.dir_set = rockspec.source.dir ~= nil rockspec.source.dir = rockspec.source.dir or rockspec.source.module or ( (filebase:match("%.lua$") or filebase:match("%.c$")) @@ -356,14 +357,11 @@ function fetch.get_sources(rockspec, extract, dest_dir) fs.unpack_archive(rockspec.source.file) if not fs.exists(rockspec.source.dir) then - -- if rockspec.source.dir can't be found, see if we only have one + -- If rockspec.source.dir can't be found, see if we only have one -- directory in store_dir. If that's the case, assume it's what -- we're looking for. - -- Ideally, we'd only do this if rockspec.source.dir was not - -- defined in the rockspec, but load_local_repository already - -- set it to an inferred value if it wasn't set there, so we - -- can't tell its status in the rockspec. - -- In any case, we only do this with rockspecs newer than 3.0. + -- We only do this if the rockspec source.dir was not set, and only + -- with rockspecs newer than 3.0. local dir_count, found_dir = 0 if deps.format_is_at_least(rockspec, "3.0") then -- cgit v1.2.3-55-g6feb From 6164f6f5c80320a0f250bbf187071b4feb668518 Mon Sep 17 00:00:00 2001 From: Geoff Leyland Date: Thu, 24 Dec 2015 21:06:00 +1300 Subject: Actually use rockspec.source.dir_set --- src/luarocks/fetch.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/luarocks/fetch.lua b/src/luarocks/fetch.lua index 039efeea..d47e0fc9 100644 --- a/src/luarocks/fetch.lua +++ b/src/luarocks/fetch.lua @@ -364,7 +364,7 @@ function fetch.get_sources(rockspec, extract, dest_dir) -- with rockspecs newer than 3.0. local dir_count, found_dir = 0 - if deps.format_is_at_least(rockspec, "3.0") then + if not rockspec.source.dir_set and deps.format_is_at_least(rockspec, "3.0") then local files = fs.list_dir() for _, f in ipairs(files) do if fs.is_dir(f) then -- cgit v1.2.3-55-g6feb