[latex3-commits] [git/LaTeX3-latex3-l3build] master: Separate scriptfiles and installfiles (0996617)

[Joseph Wright]

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

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

commit 0996617ea07176da3b603752ba549576648653fb
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Fri Sep 21 21:54:30 2018 +0100

    Separate scriptfiles and installfiles


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

0996617ea07176da3b603752ba549576648653fb
 CHANGELOG.md        |    4 ++++
 l3build-install.lua |   18 ++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b76075..d142758 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+## Changed
+
+- Entries in `scriptfiles` are excluded from `installfiles`
+
 ## [2018-09-21]
 
 ### Changed
diff --git a/l3build-install.lua b/l3build-install.lua
index 88ac5ba..ca2ae33 100644
--- a/l3build-install.lua
+++ b/l3build-install.lua
@@ -132,14 +132,6 @@ function install_files(target,full,dry_run)
   end
   local errorlevel = unpack()
   if errorlevel ~= 0 then return errorlevel end
-  errorlevel = install_files(unpackdir,"tex",{installfiles})
-    + install_files(unpackdir,"bibtex/bst",{bstfiles},module,true)
-    + install_files(unpackdir,"makeindex",{makeindexfiles},module,true)
-    + install_files(unpackdir,"scripts",{scriptfiles},module)
-  if errorlevel ~= 0 then return errorlevel end
-  if full then
-    errorlevel = doc()
-    if errorlevel ~= 0 then return errorlevel end
 
     -- Creates a 'controlled' list of files
     local function excludelist(dir,include,exclude)
@@ -165,6 +157,16 @@ function install_files(target,full,dry_run)
       return includelist
     end
 
+  local installlist = excludelist(unpackdir,installfiles,{scriptfiles})
+
+  errorlevel = install_files(unpackdir,"tex",{installlist})
+    + install_files(unpackdir,"bibtex/bst",{bstfiles},module,true)
+    + install_files(unpackdir,"makeindex",{makeindexfiles},module,true)
+    + install_files(unpackdir,"scripts",{scriptfiles},module)
+  if errorlevel ~= 0 then return errorlevel end
+  if full then
+    errorlevel = doc()
+    if errorlevel ~= 0 then return errorlevel end
     -- For the purposes here, any typesetting demo files need to be
     -- part of the main typesetting list
     local typesetfiles = typesetfiles