summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-09-29 21:16:44 +0000
committerKarl Berry <karl@freefriends.org>2019-09-29 21:16:44 +0000
commitcde95caf86c78ec9b7641198abfd0a7768f5100e (patch)
treedd771c114615e169fe3bde469f39dcac3a7ce074 /Master/texmf-dist/scripts/l3build
parent35c007d48195f11757c61c71a9a0eb88420dc9d0 (diff)
l3 (29sep19)
git-svn-id: svn://tug.org/texlive/trunk@52214 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-check.lua3
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-typesetting.lua5
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
3 files changed, 4 insertions, 6 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-check.lua b/Master/texmf-dist/scripts/l3build/l3build-check.lua
index 731d4282eaa..aad03281034 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-check.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-check.lua
@@ -722,10 +722,9 @@ function runtest(name, engine, hide, ext, pdfmode, breakout)
rm(testdir,name .. logext)
local errlevels = {}
local localtexmf = ""
- if texmfdir and texmfdir ~= "" then
+ if texmfdir and texmfdir ~= "" and direxists(texmfdir) then
localtexmf = os_pathsep .. abspath(texmfdir) .. "//"
end
- local texmfdir = abspath(texmfdir) .. "//"
for i = 1, checkruns do
errlevels[i] = run(
testdir,
diff --git a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
index 8e5b17bfc44..7f588a7c239 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-typesetting.lua
@@ -64,11 +64,10 @@ function runcmd(cmd,dir,vars)
-- Allow for local texmf files
local env = os_setenv .. " TEXMFCNF=." .. os_pathsep
local localtexmf = ""
- if texmfdir and texmfdir ~= "" then
+ if texmfdir and texmfdir ~= "" and direxists(texmfdir) then
localtexmf = os_pathsep .. abspath(texmfdir) .. "//"
end
- local envpaths = "." .. os_pathsep
- .. localtexmf
+ local envpaths = "." .. localtexmf .. os_pathsep
.. abspath(localdir) .. os_pathsep
.. dir .. (typesetsearch and os_pathsep or "")
-- Deal with spaces in paths
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index e9b47f8357a..1696ef18721 100755
--- a/Master/texmf-dist/scripts/l3build/l3build.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build.lua
@@ -25,7 +25,7 @@ for those people who are interested.
--]]
-- Version information
-release_date = "2019-09-25"
+release_date = "2019-09-29"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")