5 files changed, 69 insertions, 23 deletions

diff --git a/src/luarocks/add.lua b/src/luarocks/add.lua
index 54991291..831d3b92 100644
--- a/src/luarocks/add.lua
+++ b/src/luarocks/add.lua
@@ -68,6 +68,9 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
 
    util.printout("Updating manifest...")
    manif.make_manifest(local_cache, "one", true)
+   
+   manif.zip_manifests()
+   
    util.printout("Updating index.html...")
    index.make_index(local_cache)
 
@@ -80,8 +83,10 @@ local function add_files_to_server(refresh, rockfiles, server, upload_server)
 
    table.insert(files, "index.html")
    table.insert(files, "manifest")
-   table.insert(files, "manifest-5.1")
-   table.insert(files, "manifest-5.2")
+   for ver in util.lua_versions() do
+      table.insert(files, "manifest-"..ver)
+      table.insert(files, "manifest-"..ver..".zip")
+   end
 
    -- TODO abstract away explicit 'curl' call
 
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index 64992b91..9e4acf73 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -206,7 +206,7 @@ end
 -- @return boolean: true on success, false on failure.
 function unzip(zipfile)
    assert(zipfile)
-   return fs.execute(vars.UNZIP, zipfile)
+   return fs.execute_string(fs.quiet(vars.UNZIP.." "..fs.Q(zipfile)))
 end
 
 --- Test is file/directory exists
diff --git a/src/luarocks/index.lua b/src/luarocks/index.lua
index 6147a4d2..e0785d9c 100644
--- a/src/luarocks/index.lua
+++ b/src/luarocks/index.lua
@@ -66,7 +66,7 @@ Lua modules available from this location for use with <a href="http://www.luaroc
 <table class="main">
 ]]
 
-local index_package_start = [[
+local index_package_begin = [[
 <td class="package">
 <p><a name="$anchor"></a><a href="#$anchor" class="pkg"><b>$package</b></a> - $summary<br/>
 </p><blockquote><p>$detailed<br/>
@@ -81,10 +81,15 @@ local index_package_end = [[
 <tr><td colspan="2" class="spacer"></td></tr>
 ]]
 
-local index_footer = [[
+local index_footer_begin = [[
 </table>
 <p class="manifest">
-<a href="manifest">manifest file</a> &bull; <a href="manifest-5.1">Lua 5.1 manifest file</a> &bull; <a href="manifest-5.2">Lua 5.2 manifest file</a>
+<a href="manifest">manifest file</a>
+]]
+local index_manifest_ver = [[
+&bull; <a href="manifest-$VER">Lua $VER manifest file</a> (<a href="manifest-$VER.zip">zip</a>) 
+]]
+local index_footer_end = [[
 </p>
 </body>
 </html>
@@ -128,7 +133,7 @@ function make_index(repo)
    out:write(index_header)
    for package, version_list in util.sortedpairs(manifest.repository) do
       local latest_rockspec = nil
-      local output = index_package_start
+      local output = index_package_begin
       for version, data in util.sortedpairs(version_list, deps.compare_versions) do
          local versions = {}
          output = output..version..':&nbsp;'
@@ -170,6 +175,10 @@ function make_index(repo)
       end
       out:write(output)
    end
-   out:write(index_footer)
+   out:write(index_footer_begin)
+   for ver in util.lua_versions() do
+      out:write((index_manifest_ver:gsub("$VER", ver)))
+   end
+   out:write(index_footer_end)
    out:close()
 end
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index d0bd5e04..03377d52 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -103,26 +103,40 @@ function load_manifest(repo_url)
    if manif_core.manifest_cache[repo_url] then
       return manif_core.manifest_cache[repo_url]
    end
-
-   local vmanifest = "manifest-"..cfg.lua_version
-
-   local protocol, pathname = dir.split_url(repo_url)
+   
+   local filenames = {
+      "manifest-"..cfg.lua_version..".zip",
+      "manifest-"..cfg.lua_version,
+      "manifest",
+   }
+
+   local protocol, repodir = dir.split_url(repo_url)
+   local pathname
    if protocol == "file" then
-      local file = dir.path(pathname, vmanifest)
-      if fs.exists(file) then
-         pathname = file
-      else
-         pathname = dir.path(pathname, "manifest")
+      for _, filename in ipairs(filenames) do
+         pathname = dir.path(repodir, filename)
+         if fs.exists(pathname) then
+            break
+         end
       end
    else
-      local file, err = fetch_manifest_from(repo_url, vmanifest)
-      if not file then
-         file, err = fetch_manifest_from(repo_url, "manifest")
+      local err
+      for _, filename in ipairs(filenames) do
+         pathname, err = fetch_manifest_from(repo_url, filename)
+         if pathname then
+            break
+         end
       end
-      if not file then 
+      if not pathname then 
          return nil, err
       end
-      pathname = file
+   end
+   if pathname:match(".*%.zip$") then
+      local dir = dir.dir_name(pathname)
+      fs.change_dir(dir)
+      fs.unzip(pathname)
+      fs.pop_dir()
+      pathname = pathname:match("(.*)%.zip$")
    end
    return manif_core.manifest_loader(pathname, repo_url)
 end
@@ -343,7 +357,7 @@ function make_manifest(repo, deps_mode, versioned)
    if not ok then return nil, err end
 
    if versioned then
-      for _, luaver in ipairs({"5.1", "5.2"}) do
+      for luaver in util.lua_versions() do
          local vmanifest = { repository = {}, modules = {}, commands = {} }
          local ok, err = store_results(results, vmanifest, deps_mode, repo, luaver, cache)
          save_table(repo, "manifest-"..luaver, vmanifest)
@@ -397,6 +411,15 @@ function update_manifest(name, version, repo, deps_mode)
    return save_table(repo, "manifest", manifest)
 end
 
+function zip_manifests()
+   for ver in util.lua_versions() do
+      local file = "manifest-"..ver
+      local zip = file..".zip"
+      fs.delete(dir.path(fs.current_dir(), zip))
+      fs.zip(zip, file)
+   end
+end
+
 local function find_providers(file, root)
    assert(type(file) == "string")
    root = root or cfg.root_dir
diff --git a/src/luarocks/util.lua b/src/luarocks/util.lua
index ba20acfa..e3260359 100644
--- a/src/luarocks/util.lua
+++ b/src/luarocks/util.lua
@@ -319,6 +319,15 @@ function sortedpairs(tbl, sort_function)
    return coroutine.wrap(function() sortedpairs_iterator(tbl, sort_function) end)
 end
 
+function lua_versions()
+   local versions = { "5.1", "5.2" }
+   local i = 0
+   return function()
+      i = i + 1
+      return versions[i]
+   end
+end
+
 function starts_with(s, prefix)
    return s:sub(1,#prefix) == prefix
 end