Merge branch 'master' of github.com:keplerproject/luarocks

3 files changed, 36 insertions, 55 deletions

diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index c805fb48..691c2648 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -287,35 +287,23 @@ function unpack_archive(archive)
    return true
 end
 
+local md5_cmd = {
+   md5sum = "md5sum ",
+   openssl = "openssl md5 ",
+   md5 = "md5 ",
+}
+   
 --- Get the MD5 checksum for a file.
 -- @param file string: The file to be computed.
 -- @return string: The MD5 checksum
-function get_md5(file, md5sum)
-   file = fs.absolute_name(file)
-   local computed
-   if cfg.md5checker == "md5sum" then
-      local pipe = io.popen("md5sum "..file)
-      computed = pipe:read("*a")
-      pipe:close()
-      if computed then
-         computed = computed:gsub("[^%x]+", ""):sub(1,32)
-      end
-   elseif cfg.md5checker == "openssl" then
-      local pipe = io.popen("openssl md5 "..file)
-      computed = pipe:read("*l")
-      pipe:close()
-      if computed then
-         computed = computed:sub(-32)
-      end
-   elseif cfg.md5checker == "md5" then
-      local pipe = io.popen("md5 "..file)
-      computed = pipe:read("*l")
-      pipe:close()
-      if computed then
-         computed = computed:sub(-32)
-      end
-   end
-   return computed
+function get_md5(file)
+   local cmd = md5_cmd[cfg.md5checker]
+   if not cmd then return nil end
+   local pipe = io.popen(cmd..fs.absolute_name(file))
+   local computed = pipe:read("*a")
+   pipe:close()
+   if not computed then return nil end
+   return computed:match("("..("%x"):rep(32)..")")
 end
 
 --- Unpack an archive.
diff --git a/src/luarocks/fs/win32/tools.lua b/src/luarocks/fs/win32/tools.lua
index d2613b67..9e891fca 100644
--- a/src/luarocks/fs/win32/tools.lua
+++ b/src/luarocks/fs/win32/tools.lua
@@ -62,35 +62,23 @@ function is_file(file)
    return fs.execute("test -f", file)
 end
 
+local md5_cmd = {
+   md5sum = "md5sum ",
+   openssl = "openssl md5 ",
+   md5 = "md5 ",
+}
+   
 --- Get the MD5 checksum for a file.
 -- @param file string: The file to be computed.
 -- @return string: The MD5 checksum
-function get_md5(file, md5sum)
-   file = fs.absolute_name(file)
-   local computed
-   if cfg.md5checker == "md5sum" then
-      local pipe = io.popen("md5sum "..file)
-      computed = pipe:read("*l")
-      pipe:close()
-      if computed then
-         computed = computed:gsub("[^%x]+", ""):sub(1,32)
-      end
-   elseif cfg.md5checker == "openssl" then
-      local pipe = io.popen("openssl md5 "..file)
-      computed = pipe:read("*l")
-      pipe:close()
-      if computed then
-         computed = computed:sub(-32)
-      end
-   elseif cfg.md5checker == "md5" then
-      local pipe = io.popen("md5 "..file)
-      computed = pipe:read("*l")
-      pipe:close()
-      if computed then
-         computed = computed:sub(-32)
-      end
-   end
-   return computed
+function get_md5(file)
+   local cmd = md5_cmd[cfg.md5checker]
+   if not cmd then return nil end
+   local pipe = io.popen(cmd..fs.absolute_name(file))
+   local computed = pipe:read("*a")
+   pipe:close()
+   if not computed then return nil end
+   return computed:match("("..("%x"):rep(32)..")")
 end
 
 --- Change the current directory.
diff --git a/src/luarocks/persist.lua b/src/luarocks/persist.lua
index 293b5e93..d74a805e 100644
--- a/src/luarocks/persist.lua
+++ b/src/luarocks/persist.lua
@@ -5,6 +5,8 @@
 -- as it is used in the bootstrapping stage of the cfg module.
 module("luarocks.persist", package.seeall)
 
+local util = require("luarocks.util")
+
 --- Load a Lua file containing assignments, storing them in a table.
 -- The global environment is not propagated to the loaded file.
 -- @param filename string: the name of the file.
@@ -26,6 +28,10 @@ function load_into_table(filename, tbl)
    return result
 end
 
+local function string_sort(a,b)
+   return tostring(a) < tostring(b)
+end
+
 --- Write a table as Lua code representing a table to disk
 -- (that is, in curly brackets notation).
 -- This function handles only numbers, strings and tables
@@ -34,11 +40,10 @@ end
 -- @param tbl table: the table to be written.
 local function write_table(out, tbl, level)
    out:write("{")
-   local size = table.getn(tbl)
    local sep = "\n"
    local indent = true
    local i = 1
-   for k, v in pairs(tbl) do
+   for k, v in util.sortedpairs(tbl, string_sort) do
       out:write(sep)
       if indent then
          for n = 1,level do out:write("  ") end
@@ -90,7 +95,7 @@ function save_from_table(filename, tbl)
    if not out then
       return nil, "Cannot create file at "..filename
    end
-   for k, v in pairs(tbl) do
+   for k, v in util.sortedpairs(tbl, string_sort) do
       out:write(k.." = ")
       write_table(out, v, 1)
       out:write("\n")