summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-05-24 02:00:14 +0300
committerMarius <mariausol@gmail.com>2012-05-24 02:00:14 +0300
commit1e0c1be960bc3c573f2bcc2dd3d3250bc0998034 (patch)
tree95096858d6a437a609a910f63a3f3e713f6ef7d4 /scripts
parent235971ff07f0f5d7a3a3ce705043094bc816b432 (diff)
downloadcontext-1e0c1be960bc3c573f2bcc2dd3d3250bc0998034.tar.gz
beta 2012.05.24 00:46
Diffstat (limited to 'scripts')
-rw-r--r--scripts/context/lua/mtxrun.lua16
-rw-r--r--scripts/context/stubs/mswin/mtxrun.lua16
-rw-r--r--scripts/context/stubs/unix/mtxrun16
3 files changed, 15 insertions, 33 deletions
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 100644
--- 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