summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts/l3build
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-11-27 22:05:41 +0000
committerKarl Berry <karl@freefriends.org>2019-11-27 22:05:41 +0000
commita249bad88a4acd5b5d3112eeed746258c9dce28d (patch)
tree81909999d28ba1b3f9bf12686e4646951f2ef100 /Master/texmf-dist/scripts/l3build
parentdaa48402af9dca7dd8362ec74380bbd72623fa46 (diff)
l3build (27nov19)
git-svn-id: svn://tug.org/texlive/trunk@52948 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/l3build')
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-install.lua16
-rw-r--r--Master/texmf-dist/scripts/l3build/l3build-stdmain.lua4
-rwxr-xr-xMaster/texmf-dist/scripts/l3build/l3build.lua2
3 files changed, 14 insertions, 8 deletions
diff --git a/Master/texmf-dist/scripts/l3build/l3build-install.lua b/Master/texmf-dist/scripts/l3build/l3build-install.lua
index 77338b67a06..1007d2ed1b4 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-install.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-install.lua
@@ -105,6 +105,10 @@ function uninstall()
end
function install_files(target,full,dry_run)
+
+ -- Needed so paths are only cleaned out once
+ local cleanpaths = { }
+
local function install_files(source,dir,files,subdir)
subdir = subdir or moduledir
-- For material associated with secondary tools (BibTeX, MakeIndex)
@@ -155,8 +159,12 @@ function install_files(target,full,dry_run)
if next(filenames) then
if not dry_run then
for _,path in pairs(paths) do
- errorlevel = cleandir(target .. "/" .. path)
- if errorlevel ~= 0 then return errorlevel end
+ local dir = target .. "/" .. path
+ if not cleanpaths[dir] then
+ errorlevel = cleandir(dir)
+ if errorlevel ~= 0 then return errorlevel end
+ end
+ cleanpaths[dir] = true
end
end
for _,file in ipairs(filenames) do
@@ -164,9 +172,7 @@ function install_files(target,full,dry_run)
print("- " .. file)
else
local path,file = splitpath(file)
- local installpath = target .. "/" .. path
- mkdir(installpath)
- errorlevel = cp(file,sourcepaths[file],installpath)
+ errorlevel = cp(file,sourcepaths[file],target .. "/" .. path)
if errorlevel ~= 0 then return errorlevel end
end
end
diff --git a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
index 668b2d02d0a..9123349ee08 100644
--- a/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
+++ b/Master/texmf-dist/scripts/l3build/l3build-stdmain.lua
@@ -93,7 +93,7 @@ target_list =
},
install =
{
- desc = "Installs files into the local textmf tree",
+ desc = "Installs files into the local texmf tree",
func = install
},
manifest =
@@ -129,7 +129,7 @@ target_list =
},
uninstall =
{
- desc = "Uninstalls files from the local textmf tree",
+ desc = "Uninstalls files from the local texmf tree",
func = uninstall
},
unpack=
diff --git a/Master/texmf-dist/scripts/l3build/l3build.lua b/Master/texmf-dist/scripts/l3build/l3build.lua
index 48f3ab99d4f..ebfe0cef55f 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-11-01"
+release_date = "2019-11-27"
-- File operations are aided by the LuaFileSystem module
local lfs = require("lfs")