[latex3-commits] [git/LaTeX3-latex3-l3build] master: Always normalise file paths (34a1f1b)

[Joseph Wright]

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

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

commit 34a1f1bb768285c3aa8e66bed0d50d16c9a5abb6
Author: Joseph Wright <joseph.wright at morningstar2.co.uk>
Date:   Tue Oct 1 11:55:41 2019 +0100

    Always normalise file paths
    
    Deals with texmfdir issues.


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

34a1f1bb768285c3aa8e66bed0d50d16c9a5abb6
 CHANGELOG.md      |  4 ++++
 l3build-check.lua | 30 ++++++++++++++----------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 330e7b7..39b7665 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ this project uses date-based 'snapshot' version identifiers.
 
 ## [Unreleased]
 
+### Changed
+
+- Normalise out file paths in all cases
+
 ## [2019-09-30]
 
 ### Added
diff --git a/l3build-check.lua b/l3build-check.lua
index aad0328..e2cdd65 100644
--- a/l3build-check.lua
+++ b/l3build-check.lua
@@ -137,22 +137,20 @@ local function normalize_log(content,engine,errlevels)
     lastline = ""
     -- Zap ./ at begin of filename
     line = gsub(line, "%(%.%/", "(")
-    -- Zap paths if places other than 'here' are accessible
-    if checksearch then
-      -- The pattern excludes < and > as the image part can have
-      -- several entries on one line
-      local pattern = "%w?:?/[^ %<%>]*/([^/%(%)]*%.%w*)"
-      -- Files loaded from TeX: all start ( -- )
-      line = gsub(line, "%(" .. pattern, "(../%1")
-      -- Images
-      line = gsub(line, "<" .. pattern .. ">", "<../%1>")
-      -- luaotfload files start with keywords
-      line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(")
-      line = gsub(line, ": " .. pattern .. "%)", ": ../%1)")
-      -- Deal with XeTeX specials
-      if match(line, "^%.+\\XeTeX.?.?.?file") then
-        line = gsub(line, pattern, "../%1")
-      end
+    -- Zap paths
+    -- The pattern excludes < and > as the image part can have
+    -- several entries on one line
+    local pattern = "%w?:?/[^ %<%>]*/([^/%(%)]*%.%w*)"
+    -- Files loaded from TeX: all start ( -- )
+    line = gsub(line, "%(" .. pattern, "(../%1")
+    -- Images
+    line = gsub(line, "<" .. pattern .. ">", "<../%1>")
+    -- luaotfload files start with keywords
+    line = gsub(line, "from " .. pattern .. "%(", "from. ./%1(")
+    line = gsub(line, ": " .. pattern .. "%)", ": ../%1)")
+    -- Deal with XeTeX specials
+    if match(line, "^%.+\\XeTeX.?.?.?file") then
+      line = gsub(line, pattern, "../%1")
     end
     -- Deal with dates
     if match(line, "[^<]%d%d%d%d[/%-]%d%d[/%-]%d%d") then