From 9494d9dd118ab3202bcbc7f22cf787fb067afde8 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Thu, 24 May 2012 00:46:00 +0200 Subject: beta 2012.05.24 00:46 --- scripts/context/lua/mtxrun.lua | 16 +++++----------- scripts/context/stubs/mswin/mtxrun.lua | 16 +++++----------- scripts/context/stubs/unix/mtxrun | 16 +++++----------- 3 files changed, 15 insertions(+), 33 deletions(-) (limited to 'scripts') diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index 9d0edf689..326feecd1 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -12334,20 +12334,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" + resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" end +resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec + -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index 9d0edf689..326feecd1 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -12334,20 +12334,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" + resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" end +resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec + -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index 9d0edf689..326feecd1 100755 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -12334,20 +12334,14 @@ resolvers.luacnfstate = "unknown" if environment.default_texmfcnf then -- unfortunately we now have quite some overkill in the spec (not so nice on a network) - local luacnfspec = environment.default_texmfcnf - -- we also want to use this in the minimals / standalone - -- bu tit's too tricky as it can be an expanded spec - -- luacnfspec = gsub(luacnfspec,"%-local","-local,-context") - -- and we also need to support the home dir (for taco) - resolvers.luacnfspec = 'home:texmf/web2c;' .. luacnfspec -elseif this_is_texlive then - -- old, in case default_texmfcnf is not supported yet - resolvers.luacnfspec = 'selfautodir:;selfautoparent:;{selfautodir:,selfautoparent:}{/share,}/texmf{-local,}/web2c' + resolvers.luacnfspec = environment.default_texmfcnf else - -- the best for the minimals / standalone - resolvers.luacnfspec = 'home:texmf/web2c;selfautoparent:texmf{-local,-context,}/web2c' + -- resolvers.luacnfspec = "selfautoparent:texmf{-local,-context,}/web2c" + resolvers.luacnfspec = "{selfautoloc:,selfautodir:,selfautoparent:}{,/texmf{-local,}/web2c}" end +resolvers.luacnfspec = 'home:texmf/web2c;' .. resolvers.luacnfspec + -- which (as we want users to use the web2c path) be can be simplified to this: -- -- if environment and environment.ownpath and string.find(environment.ownpath,"[\\/]texlive[\\/]") then -- cgit v1.2.3