summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/scripts
diff options
context:
space:
mode:
authorTaco Hoekwater <taco@elvenkind.com>2011-06-22 10:59:18 +0000
committerTaco Hoekwater <taco@elvenkind.com>2011-06-22 10:59:18 +0000
commite9926fd469aff4508bb8cacdfa41eb2186e40ef8 (patch)
tree6cd9bd4214218d06204986e7b65e3cd7d33bbcfc /Master/texmf-dist/scripts
parent97425552ee681cfb80901aa7e68b13a82fad5a1c (diff)
Previous context mkiv patch for runtime files was problematic:
it always did a deep search on all paths, regardless of whether or not // was appended to the specification. This commit fixes that. git-svn-id: svn://tug.org/texlive/trunk@23087 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts')
-rwxr-xr-xMaster/texmf-dist/scripts/context/lua/mtxrun.lua3
-rwxr-xr-xMaster/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua3
-rwxr-xr-xMaster/texmf-dist/scripts/context/stubs/unix/mtxrun3
3 files changed, 6 insertions, 3 deletions
diff --git a/Master/texmf-dist/scripts/context/lua/mtxrun.lua b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
index 40c61ef000c..5fbc817e24a 100755
--- a/Master/texmf-dist/scripts/context/lua/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/lua/mtxrun.lua
@@ -10044,7 +10044,7 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
if validate then
for s in gmatch(str,"[^,]+") do
local restoreslashes = false
- if gmatch(s, "//$") then restoreslashes = true end
+ if find(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
@@ -12103,6 +12103,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
local path = pathlist[k]
local pathname = lpegmatch(inhibitstripper,path)
local doscan = path == pathname -- no ^!!
+ if not find (pathname, '//$') then doscan = false end
done = false
-- using file list
if filelist then
diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
index 40c61ef000c..5fbc817e24a 100755
--- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
+++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua
@@ -10044,7 +10044,7 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
if validate then
for s in gmatch(str,"[^,]+") do
local restoreslashes = false
- if gmatch(s, "//$") then restoreslashes = true end
+ if find(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
@@ -12103,6 +12103,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
local path = pathlist[k]
local pathname = lpegmatch(inhibitstripper,path)
local doscan = path == pathname -- no ^!!
+ if not find (pathname, '//$') then doscan = false end
done = false
-- using file list
if filelist then
diff --git a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
index 40c61ef000c..5fbc817e24a 100755
--- a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
+++ b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun
@@ -10044,7 +10044,7 @@ local function splitpathexpr(str, newlist, validate) -- I couldn't resist lpeggi
if validate then
for s in gmatch(str,"[^,]+") do
local restoreslashes = false
- if gmatch(s, "//$") then restoreslashes = true end
+ if find(s, "//$") then restoreslashes = true end
s = validate(s)
if s then
n = n + 1 ; t[n] = s
@@ -12103,6 +12103,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo :
local path = pathlist[k]
local pathname = lpegmatch(inhibitstripper,path)
local doscan = path == pathname -- no ^!!
+ if not find (pathname, '//$') then doscan = false end
done = false
-- using file list
if filelist then