1 files changed, 41 insertions, 59 deletions
diff --git a/tex/context/base/data-tmf.lua b/tex/context/base/data-tmf.lua
index 7421eacfc..c26f8e6e6 100644
--- a/tex/context/base/data-tmf.lua
+++ b/tex/context/base/data-tmf.lua
@@ -6,70 +6,52 @@ if not modules then modules = { } end modules ['data-tmf'] = {
     license   = "see context related readme files"
 }
 
-local find, gsub, match = string.find, string.gsub, string.match
-local getenv, setenv = os.getenv, os.setenv
+--  =  <<
+--  ?  ??
+--  <  +=
+--  >  =+
 
--- loads *.tmf files in minimal tree roots (to be optimized and documented)
+function resolvers.load_tree(tree)
+    if type(tree) == "string" and tree ~= "" then
 
-function resolvers.check_environment(tree)
-    logs.simpleline()
-    setenv('TMP', getenv('TMP') or getenv('TEMP') or getenv('TMPDIR') or getenv('HOME'))
-    setenv('TEXOS', getenv('TEXOS') or ("texmf-" .. os.platform))
-    setenv('TEXPATH', gsub(tree or "tex","\/+$",''))
-    setenv('TEXMFOS', getenv('TEXPATH') .. "/" .. getenv('TEXOS'))
-    logs.simpleline()
-    logs.simple("preset : TEXPATH => %s", getenv('TEXPATH'))
-    logs.simple("preset : TEXOS   => %s", getenv('TEXOS'))
-    logs.simple("preset : TEXMFOS => %s", getenv('TEXMFOS'))
-    logs.simple("preset : TMP     => %s", getenv('TMP'))
-    logs.simple('')
-end
+        local getenv, setenv = resolvers.getenv, resolvers.setenv
 
-function resolvers.load_environment(name) -- todo: key=value as well as lua
-    local f = io.open(name)
-    if f then
-        for line in f:lines() do
-            if find(line,"^[%%%#]") then
-                -- skip comment
-            else
-                local key, how, value = match(line,"^(.-)%s*([<=>%?]+)%s*(.*)%s*$")
-                if how then
-                    value = gsub(value,"%%(.-)%%", function(v) return getenv(v) or "" end)
-                        if how == "=" or how == "<<" then
-                            setenv(key,value)
-                    elseif how == "?" or how == "??" then
-                            setenv(key,getenv(key) or value)
-                    elseif how == "<" or how == "+=" then
-                        if getenv(key) then
-                            setenv(key,getenv(key) .. io.fileseparator .. value)
-                        else
-                            setenv(key,value)
-                        end
-                    elseif how == ">" or how == "=+" then
-                        if getenv(key) then
-                            setenv(key,value .. io.pathseparator .. getenv(key))
-                        else
-                            setenv(key,value)
-                        end
-                    end
-                end
-            end
-        end
-        f:close()
-    end
-end
+        -- later might listen to the raw osenv var as well
+        local texos   = "texmf-" .. os.platform
 
-function resolvers.load_tree(tree)
-    if tree and tree ~= "" then
-        local setuptex = 'setuptex.tmf'
-        if lfs.attributes(tree, "mode") == "directory" then -- check if not nil
-            setuptex = tree .. "/" .. setuptex
-        else
-            setuptex = tree
+        local oldroot = environment.texroot
+        local newroot = file.collapse_path(tree)
+
+        local newtree = file.join(newroot,texos)
+        local newpath = file.join(newtree,"bin")
+
+        if not lfs.isdir(newtree) then
+            logs.simple("no '%s' under tree %s",texos,tree)
+            os.exit()
         end
-        if io.exists(setuptex) then
-            resolvers.check_environment(tree)
-            resolvers.load_environment(setuptex)
+        if not lfs.isdir(newpath) then
+            logs.simple("no '%s/bin' under tree %s",texos,tree)
+            os.exit()
         end
+
+        local texmfos = newtree
+
+        environment.texroot = newroot
+        environment.texos   = texos
+        environment.texmfos = texmfos
+
+        setenv('SELFAUTOPARENT', newroot)
+        setenv('SELFAUTODIR',    newtree)
+        setenv('SELFAUTOLOC',    newpath)
+        setenv('TEXROOT',        newroot)
+        setenv('TEXOS',          texos)
+        setenv('TEXMFOS',        texmfos)
+        setenv('TEXROOT',        newroot)
+        setenv('TEXMFCNF',       resolvers.luacnfspec)
+        setenv("PATH",           newpath .. io.pathseparator .. getenv("PATH"))
+
+        logs.simple("changing from root '%s' to '%s'",oldroot,newroot)
+        logs.simple("prepending '%s' to binary path",newpath)
+        logs.simple()
     end
 end