[latex3-commits] [git/l3build] master: Revert "Fix inclusion of PDFs from docfiledir in CTAN releases" (ba8c305)

[Joseph Wright]

Repository : https://github.com/latex3/l3build
On branch  : master
Link       : https://github.com/latex3/l3build/commit/ba8c305142648957add54a09c247fa16689ed4af

>---------------------------------------------------------------

commit ba8c305142648957add54a09c247fa16689ed4af
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Nov 28 20:08:31 2017 +0000

    Revert "Fix inclusion of PDFs from docfiledir in CTAN releases"
    
    This reverts commit 4f45539ff1ff24f1d01c620e528e480790ed3ebb.


>---------------------------------------------------------------

ba8c305142648957add54a09c247fa16689ed4af
 l3build.lua |   15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/l3build.lua b/l3build.lua
index 1b6fb4e..67b80d7 100644
--- a/l3build.lua
+++ b/l3build.lua
@@ -857,23 +857,20 @@ end
 
 -- Copy files to the main CTAN release directory
 function copyctan()
-  -- Do all of the copying
-  for _,filetype in pairs(
+  -- Do all of the copying in one go
+  for _,i in ipairs(
       {
         bibfiles,
         demofiles,
         docfiles,
         pdffiles,
+        sourcefiles,
+        textfiles,
         typesetlist
       }
     ) do
-    for _,file in pairs(filetype) do
-      cp(file, docfiledir, ctandir .. "/" .. ctanpkg)
-    end
-  end
-  for _,filetype in pairs({sourcefiles, textfiles}) do
-    for _,file in pairs(filetype) do
-      cp(file, maindir, ctandir .. "/" .. ctanpkg)
+    for _,j in ipairs(i) do
+      cp(j, ".", ctandir .. "/" .. ctanpkg)
     end
   end
 end