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

Conflicts:
	src/bin/luarocks
	src/luarocks/fs/unix/tools.lua
	src/luarocks/path.lua

Fixed:
	src/luarocks/path_cmd.lua: moved meta-data from path.lua
	Makefile: added path_cmd.lua to the list of installed files

4 files changed, 20 insertions, 16 deletions

diff --git a/src/bin/luarocks b/src/bin/luarocks
index 9c190175..b85fbc7c 100755
--- a/src/bin/luarocks
+++ b/src/bin/luarocks
@@ -16,7 +16,7 @@ commands = {
    remove = "luarocks.remove",
    make = "luarocks.make",
    download = "luarocks.download",
-   path = "luarocks.path_command",
+   path = "luarocks.path_cmd",
    show = "luarocks.show",
    new_version = "luarocks.new_version",
    lint = "luarocks.lint",
diff --git a/src/luarocks/fs/unix/tools.lua b/src/luarocks/fs/unix/tools.lua
index a288dd60..8a71171d 100644
--- a/src/luarocks/fs/unix/tools.lua
+++ b/src/luarocks/fs/unix/tools.lua
@@ -19,9 +19,13 @@ end
 -- Uses the module's internal directory stack.
 -- @return string: the absolute pathname of the current directory.
 function tools.current_dir()
-   local pipe = io.popen(vars.PWD)
-   local current = pipe:read("*l")
-   pipe:close()
+   local current = cfg.cache_pwd
+   if not current then
+      local pipe = io.popen(fs.Q(vars.PWD))
+      current = pipe:read("*l")
+      pipe:close()
+      cfg.cache_pwd = current
+   end
    for _, directory in ipairs(dir_stack) do
       current = fs.absolute_name(directory, current)
    end
@@ -34,7 +38,7 @@ end
 -- @return boolean: true if command succeeds (status code 0), false
 -- otherwise.
 function tools.execute_string(cmd)
-   local code = os.execute(command_at(fs.current_dir(), cmd))
+   local code, err = os.execute(command_at(fs.current_dir(), cmd))
    if code == 0 or code == true then
       return true
    else
diff --git a/src/luarocks/manif.lua b/src/luarocks/manif.lua
index d160d2db..f1d1629c 100644
--- a/src/luarocks/manif.lua
+++ b/src/luarocks/manif.lua
@@ -133,7 +133,7 @@ function manif.load_manifest(repo_url)
       local err, errcode
       for _, filename in ipairs(filenames) do
          pathname, err, errcode = fetch_manifest_from(repo_url, filename)
-         if pathname or errcode == "network" then
+         if pathname then
             break
          end
       end
diff --git a/src/luarocks/path_command.lua b/src/luarocks/path_cmd.lua
index 4e52bdc9..d52f985a 100644
--- a/src/luarocks/path_command.lua
+++ b/src/luarocks/path_cmd.lua
@@ -1,16 +1,16 @@
 
---- Module implementing the LuaRocks "path" command.
--- Return the currently configured package path.
-local path_command = {}
+--- @module luarocks.path_cmd
+-- Driver for the `luarocks path` command.
+local path_cmd = {}
 
-local path = require("luarocks.path")
-local cfg = require("luarocks.cfg")
 local util = require("luarocks.util")
 local deps = require("luarocks.deps")
+local cfg = require("luarocks.cfg")
+local path = require("luarocks.path")
 
-path_command.help_summary = "Return the currently configured package path."
-path_command.help_arguments = ""
-path_command.help = [[
+path_cmd.help_summary = "Return the currently configured package path."
+path_cmd.help_arguments = ""
+path_cmd.help = [[
 Returns the package path currently configured for this installation
 of LuaRocks, formatted as shell commands to update LUA_PATH and
 LUA_CPATH. (On Unix systems, you may run: eval `luarocks path`)
@@ -18,7 +18,7 @@ LUA_CPATH. (On Unix systems, you may run: eval `luarocks path`)
 
 --- Driver function for "path" command.
 -- @return boolean This function always succeeds.
-function path_command.run(...)
+function path_cmd.run(...)
    local flags = util.parse_flags(...)
    local deps_mode = deps.get_deps_mode(flags)
    
@@ -55,4 +55,4 @@ function path_command.run(...)
    return true
 end
 
-return path_command
+return path_cmd