diff options
| author | Taco Hoekwater <taco@elvenkind.com> | 2011-06-22 15:38:16 +0000 |
|---|---|---|
| committer | Taco Hoekwater <taco@elvenkind.com> | 2011-06-22 15:38:16 +0000 |
| commit | ddc86c5d4d6c0c79ef03b1ed2f43aee8a955687e (patch) | |
| tree | 13512ab4103a2619fc0e7ed3a8505e6707daa337 /Master/texmf-dist/scripts/context | |
| parent | eaf7c239e056c7048ed172278c5040d5925010d4 (diff) | |
yet another mtxrun fix for runtime-discovered files (it should really be done now)
git-svn-id: svn://tug.org/texlive/trunk@23090 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/scripts/context')
| -rwxr-xr-x | Master/texmf-dist/scripts/context/lua/mtxrun.lua | 29 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua | 29 | ||||
| -rwxr-xr-x | Master/texmf-dist/scripts/context/stubs/unix/mtxrun | 29 |
3 files changed, 39 insertions, 48 deletions
diff --git a/Master/texmf-dist/scripts/context/lua/mtxrun.lua b/Master/texmf-dist/scripts/context/lua/mtxrun.lua index 5fbc817e24a..8debdf95551 100755 --- a/Master/texmf-dist/scripts/context/lua/mtxrun.lua +++ b/Master/texmf-dist/scripts/context/lua/mtxrun.lua @@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : end end end - if not done and doscan then + if not done then -- check if on disk / unchecked / does not work at all / also zips -- TH perhaps it did not work because of missing resolvers.resolve() -- and resolvers.scanfiles() calls ... @@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if not find(pname,"%*") then local ppname = gsub(pname,"/+$","") if can_be_dir(ppname) then - local files = resolvers.scanfiles(ppname) - if files then - for k=1,#wantedfiles do - local w = wantedfiles[k] - local subpath = files[w] - if subpath then - local fname = filejoin(ppname,subpath,w) - if isreadable(fname) then - if trace_detail then - report_resolving("found '%s' by scanning",fname) - end - result[#result+1] = fname - done = true - if not allresults then break end - end + local files = {} + if doscan then files = resolvers.scanfiles(ppname) end + for k=1,#wantedfiles do + local w = wantedfiles[k] + local subpath = files[w] or '' + local fname = filejoin(ppname,subpath,w) + if isreadable(fname) then + if trace_detail then + report_resolving("found '%s' by scanning",fname) end + result[#result+1] = fname + done = true + if not allresults then break end end end else diff --git a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua index 5fbc817e24a..8debdf95551 100755 --- a/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua +++ b/Master/texmf-dist/scripts/context/stubs/mswin/mtxrun.lua @@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : end end end - if not done and doscan then + if not done then -- check if on disk / unchecked / does not work at all / also zips -- TH perhaps it did not work because of missing resolvers.resolve() -- and resolvers.scanfiles() calls ... @@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if not find(pname,"%*") then local ppname = gsub(pname,"/+$","") if can_be_dir(ppname) then - local files = resolvers.scanfiles(ppname) - if files then - for k=1,#wantedfiles do - local w = wantedfiles[k] - local subpath = files[w] - if subpath then - local fname = filejoin(ppname,subpath,w) - if isreadable(fname) then - if trace_detail then - report_resolving("found '%s' by scanning",fname) - end - result[#result+1] = fname - done = true - if not allresults then break end - end + local files = {} + if doscan then files = resolvers.scanfiles(ppname) end + for k=1,#wantedfiles do + local w = wantedfiles[k] + local subpath = files[w] or '' + local fname = filejoin(ppname,subpath,w) + if isreadable(fname) then + if trace_detail then + report_resolving("found '%s' by scanning",fname) end + result[#result+1] = fname + done = true + if not allresults then break end end end else diff --git a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun index 5fbc817e24a..8debdf95551 100755 --- a/Master/texmf-dist/scripts/context/stubs/unix/mtxrun +++ b/Master/texmf-dist/scripts/context/stubs/unix/mtxrun @@ -12135,7 +12135,7 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : end end end - if not done and doscan then + if not done then -- check if on disk / unchecked / does not work at all / also zips -- TH perhaps it did not work because of missing resolvers.resolve() -- and resolvers.scanfiles() calls ... @@ -12146,22 +12146,19 @@ local function collect_instance_files(filename,askedformat,allresults) -- todo : if not find(pname,"%*") then local ppname = gsub(pname,"/+$","") if can_be_dir(ppname) then - local files = resolvers.scanfiles(ppname) - if files then - for k=1,#wantedfiles do - local w = wantedfiles[k] - local subpath = files[w] - if subpath then - local fname = filejoin(ppname,subpath,w) - if isreadable(fname) then - if trace_detail then - report_resolving("found '%s' by scanning",fname) - end - result[#result+1] = fname - done = true - if not allresults then break end - end + local files = {} + if doscan then files = resolvers.scanfiles(ppname) end + for k=1,#wantedfiles do + local w = wantedfiles[k] + local subpath = files[w] or '' + local fname = filejoin(ppname,subpath,w) + if isreadable(fname) then + if trace_detail then + report_resolving("found '%s' by scanning",fname) end + result[#result+1] = fname + done = true + if not allresults then break end end end else |