summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-02-21 22:55:44 +0000
committerKarl Berry <karl@freefriends.org>2020-02-21 22:55:44 +0000
commitf7fd247772c2a77bffd50dfe8045b8441ca091e9 (patch)
tree56b4c3e6990e81dd1a488b3d59e893e3e5cddaef /Master/texmf-dist/scripts/l3build
parent8c001b9ec06abf4a378fbe9fd81bde3e5343d6c1 (diff)
l3 (21feb20)
git-svn-id: svn://tug.org/texlive/trunk@53862 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-unpack.lua22
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
2 files changed, 9 insertions, 15 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
index 47aaca7ca72..412b5e84da7 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-unpack.lua
@@ -73,28 +73,22 @@ bundleunpack = bundleunpack or function(sourcedirs, sources)
end
for _,i in ipairs(unpackfiles) 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 .. "/" .. path,
+ local success = io.popen(
+ "cd " .. unpackdir .. "/" .. path .. os_concat ..
os_setenv .. " TEXINPUTS=." .. os_pathsep
.. localdir .. (unpacksearch and os_pathsep or "") ..
os_concat ..
os_setenv .. " LUAINPUTS=." .. os_pathsep
.. localdir .. (unpacksearch and os_pathsep or "") ..
os_concat ..
- unpackexe .. " " .. unpackopts .. " " .. name .. " < "
- .. localdir .. "/yes"
- .. (options["quiet"] and (" > " .. os_null) or "")
- )
- if errorlevel ~=0 then
- return errorlevel
+ unpackexe .. " " .. unpackopts .. " " .. name
+ .. (options["quiet"] and (" > " .. os_null) or ""),
+ "w"
+ ):write(string.rep("y\n", 300)):close()
+ if not success then
+ return 1
end
end
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 03521ce612e..ccb05eed316 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 = "2020-02-17"
+release_date = "2020-02-21"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")