10 files changed, 11 insertions, 5 deletions

diff --git a/spec/unit_build_spec.lua b/spec/unit/build_spec.lua
index 6ab143c6..6ab143c6 100644
--- a/spec/unit_build_spec.lua
+++ b/spec/unit/build_spec.lua
diff --git a/spec/dir_spec.lua b/spec/unit/dir_spec.lua
index b5dadda8..b5dadda8 100644
--- a/spec/dir_spec.lua
+++ b/spec/unit/dir_spec.lua
diff --git a/spec/fetch_spec.lua b/spec/unit/fetch_spec.lua
index 38da379e..38da379e 100644
--- a/spec/fetch_spec.lua
+++ b/spec/unit/fetch_spec.lua
diff --git a/spec/fs_spec.lua b/spec/unit/fs_spec.lua
index aea86af3..aea86af3 100644
--- a/spec/fs_spec.lua
+++ b/spec/unit/fs_spec.lua
diff --git a/spec/fun_spec.lua b/spec/unit/fun_spec.lua
index 9844ec27..9844ec27 100644
--- a/spec/fun_spec.lua
+++ b/spec/unit/fun_spec.lua
diff --git a/spec/persist_spec.lua b/spec/unit/persist_spec.lua
index f426fd83..f426fd83 100644
--- a/spec/persist_spec.lua
+++ b/spec/unit/persist_spec.lua
diff --git a/spec/rockspecs_spec.lua b/spec/unit/rockspecs_spec.lua
index 5b0573fe..5b0573fe 100644
--- a/spec/rockspecs_spec.lua
+++ b/spec/unit/rockspecs_spec.lua
diff --git a/spec/sysdetect_spec.lua b/spec/unit/sysdetect_spec.lua
index 6ec6f6b6..6ec6f6b6 100644
--- a/spec/sysdetect_spec.lua
+++ b/spec/unit/sysdetect_spec.lua
diff --git a/spec/tools_spec.lua b/spec/unit/tools_spec.lua
index 29e21740..29e21740 100644
--- a/spec/tools_spec.lua
+++ b/spec/unit/tools_spec.lua
diff --git a/src/luarocks/fs/tools.lua b/src/luarocks/fs/tools.lua
index a7724dc7..23f2561e 100644
--- a/src/luarocks/fs/tools.lua
+++ b/src/luarocks/fs/tools.lua
@@ -48,12 +48,11 @@ do
    end
 end
 
+local current_dir_with_cache
 do
    local cache_pwd
-   --- Obtain current directory.
-   -- Uses the module's internal directory stack.
-   -- @return string: the absolute pathname of the current directory.
-   function tools.current_dir()
+
+   current_dir_with_cache = function()
       local current = cache_pwd
       if not current then
          local pipe = io.popen(fs.quiet_stderr(vars.PWD))
@@ -66,6 +65,13 @@ do
       end
       return current, cache_pwd
    end
+
+   --- Obtain current directory.
+   -- Uses the module's internal directory stack.
+   -- @return string: the absolute pathname of the current directory.
+   function tools.current_dir()
+      return (current_dir_with_cache()) -- drop second return
+   end
 end
 
 --- Change the current directory.
@@ -107,7 +113,7 @@ end
 -- @return boolean: true if command succeeds (status code 0), false
 -- otherwise.
 function tools.execute_string(cmd)
-   local current, cache_pwd = fs.current_dir()
+   local current, cache_pwd = current_dir_with_cache()
    if not current then return false end
    if current ~= cache_pwd then
       cmd = fs.command_at(current, cmd)