[latex3-commits] [l3svn] 03/09: unpack in subdirectories

[noreply at latex-project.org]

This is an automated email from the git hooks/post-receive script.

joseph pushed a commit to branch master
in repository l3svn.

commit c8225159e3c4b50c2acbd379ec020a963fd8f4c7
Author: XZS <d.f.fischer at web.de>
Date:   Fri Apr 14 17:36:54 2017 +0200

    unpack in subdirectories
    
    When files inside a subdirectory are unpacked, the generated results
    should end up in the same place. For this to happen, unpacking has to be
    executed in the respective directory.
---
 l3build/l3build.lua |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/l3build/l3build.lua b/l3build/l3build.lua
index 7d37877..281e64f 100644
--- a/l3build/l3build.lua
+++ b/l3build/l3build.lua
@@ -2133,20 +2133,21 @@ bundleunpack = bundleunpack or function(sourcedir, sources)
     end
   end
   for _,i in ipairs(unpackfiles) do
-    for _,j in ipairs(filelist(unpackdir, i)) do
+    for j,_ in pairs(tree(unpackdir, i)) do
       -- This 'yes' business is needed to pass a series of "y\n" to
       -- TeX if \askforoverwrite is true
       -- That is all done using a file as it's the only way on Windows and
       -- on Unix the "yes" command can't be used inside execute (it never
       -- stops, which confuses Lua)
       execute(os_yes .. ">>" .. localdir .. "/yes")
+      local path, name = splitpath(j)
       local localdir = abspath(localdir)
       errorlevel = run(
-        unpackdir,
+        unpackdir .. "/" .. path,
         os_setenv .. " TEXINPUTS=." .. os_pathsep
           .. localdir .. (unpacksearch and os_pathsep or "") ..
         os_concat ..
-        unpackexe .. " " .. unpackopts .. " " .. j .. " < "
+        unpackexe .. " " .. unpackopts .. " " .. name .. " < "
           .. localdir .. "/yes"
           .. (optquiet and (" > " .. os_null) or "")
       )

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.