2021-06-24 23:41:00

3 files changed, 57 insertions, 54 deletions

diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua
index 90674eacc..2317496b5 100644
--- a/scripts/context/stubs/mswin/mtxrun.lua
+++ b/scripts/context/stubs/mswin/mtxrun.lua
@@ -3837,7 +3837,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-os"] = package.loaded["l-os"] or true
 
--- original size: 19423, stripped down to: 10421
+-- original size: 19514, stripped down to: 10470
 
 if not modules then modules={} end modules ['l-os']={
  version=1.001,
@@ -3966,10 +3966,25 @@ if not os.__getenv__ then
   setmetatable(os.env,{ __index=__index,__newindex=__newindex } )
  end
 end
+if not io.fileseparator then
+ if find(os.getenv("PATH"),";",1,true) then
+  io.fileseparator,io.pathseparator,os.type="\\",";",os.type or "windows"
+ else
+  io.fileseparator,io.pathseparator,os.type="/",":",os.type or "unix"
+ end
+end
+os.type=os.type or (io.pathseparator==";"    and "windows") or "unix"
+os.name=os.name or (os.type=="windows" and "mswin"  ) or "linux"
+if os.type=="windows" then
+ os.libsuffix,os.binsuffix,os.binsuffixes='dll','exe',{ 'exe','cmd','bat' }
+else
+ os.libsuffix,os.binsuffix,os.binsuffixes='so','',{ '' }
+end
 local execute=os.execute
 local iopopen=io.popen
+local ostype=os.type
 local function resultof(command)
- local handle=iopopen(command,"rb") 
+ local handle=iopopen(command,ostype=="windows" and "rb" or "r")
  if handle then
   local result=handle:read("*all") or ""
   handle:close()
@@ -3982,20 +3997,6 @@ os.resultof=resultof
 function os.pipeto(command)
  return iopopen(command,"w") 
 end
-if not io.fileseparator then
- if find(os.getenv("PATH"),";",1,true) then
-  io.fileseparator,io.pathseparator,os.type="\\",";",os.type or "windows"
- else
-  io.fileseparator,io.pathseparator,os.type="/",":",os.type or "unix"
- end
-end
-os.type=os.type or (io.pathseparator==";"    and "windows") or "unix"
-os.name=os.name or (os.type=="windows" and "mswin"  ) or "linux"
-if os.type=="windows" then
- os.libsuffix,os.binsuffix,os.binsuffixes='dll','exe',{ 'exe','cmd','bat' }
-else
- os.libsuffix,os.binsuffix,os.binsuffixes='so','',{ '' }
-end
 local launchers={
  windows="start %s",
  macosx="open %s",
@@ -25896,8 +25897,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1024297
--- stripped bytes    : 402139
+-- original bytes    : 1024388
+-- stripped bytes    : 402181
 
 -- end library merge
 
diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun
index 90674eacc..2317496b5 100644
--- a/scripts/context/stubs/unix/mtxrun
+++ b/scripts/context/stubs/unix/mtxrun
@@ -3837,7 +3837,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-os"] = package.loaded["l-os"] or true
 
--- original size: 19423, stripped down to: 10421
+-- original size: 19514, stripped down to: 10470
 
 if not modules then modules={} end modules ['l-os']={
  version=1.001,
@@ -3966,10 +3966,25 @@ if not os.__getenv__ then
   setmetatable(os.env,{ __index=__index,__newindex=__newindex } )
  end
 end
+if not io.fileseparator then
+ if find(os.getenv("PATH"),";",1,true) then
+  io.fileseparator,io.pathseparator,os.type="\\",";",os.type or "windows"
+ else
+  io.fileseparator,io.pathseparator,os.type="/",":",os.type or "unix"
+ end
+end
+os.type=os.type or (io.pathseparator==";"    and "windows") or "unix"
+os.name=os.name or (os.type=="windows" and "mswin"  ) or "linux"
+if os.type=="windows" then
+ os.libsuffix,os.binsuffix,os.binsuffixes='dll','exe',{ 'exe','cmd','bat' }
+else
+ os.libsuffix,os.binsuffix,os.binsuffixes='so','',{ '' }
+end
 local execute=os.execute
 local iopopen=io.popen
+local ostype=os.type
 local function resultof(command)
- local handle=iopopen(command,"rb") 
+ local handle=iopopen(command,ostype=="windows" and "rb" or "r")
  if handle then
   local result=handle:read("*all") or ""
   handle:close()
@@ -3982,20 +3997,6 @@ os.resultof=resultof
 function os.pipeto(command)
  return iopopen(command,"w") 
 end
-if not io.fileseparator then
- if find(os.getenv("PATH"),";",1,true) then
-  io.fileseparator,io.pathseparator,os.type="\\",";",os.type or "windows"
- else
-  io.fileseparator,io.pathseparator,os.type="/",":",os.type or "unix"
- end
-end
-os.type=os.type or (io.pathseparator==";"    and "windows") or "unix"
-os.name=os.name or (os.type=="windows" and "mswin"  ) or "linux"
-if os.type=="windows" then
- os.libsuffix,os.binsuffix,os.binsuffixes='dll','exe',{ 'exe','cmd','bat' }
-else
- os.libsuffix,os.binsuffix,os.binsuffixes='so','',{ '' }
-end
 local launchers={
  windows="start %s",
  macosx="open %s",
@@ -25896,8 +25897,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1024297
--- stripped bytes    : 402139
+-- original bytes    : 1024388
+-- stripped bytes    : 402181
 
 -- end library merge
 
diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua
index 90674eacc..2317496b5 100644
--- a/scripts/context/stubs/win64/mtxrun.lua
+++ b/scripts/context/stubs/win64/mtxrun.lua
@@ -3837,7 +3837,7 @@ do -- create closure to overcome 200 locals limit
 
 package.loaded["l-os"] = package.loaded["l-os"] or true
 
--- original size: 19423, stripped down to: 10421
+-- original size: 19514, stripped down to: 10470
 
 if not modules then modules={} end modules ['l-os']={
  version=1.001,
@@ -3966,10 +3966,25 @@ if not os.__getenv__ then
   setmetatable(os.env,{ __index=__index,__newindex=__newindex } )
  end
 end
+if not io.fileseparator then
+ if find(os.getenv("PATH"),";",1,true) then
+  io.fileseparator,io.pathseparator,os.type="\\",";",os.type or "windows"
+ else
+  io.fileseparator,io.pathseparator,os.type="/",":",os.type or "unix"
+ end
+end
+os.type=os.type or (io.pathseparator==";"    and "windows") or "unix"
+os.name=os.name or (os.type=="windows" and "mswin"  ) or "linux"
+if os.type=="windows" then
+ os.libsuffix,os.binsuffix,os.binsuffixes='dll','exe',{ 'exe','cmd','bat' }
+else
+ os.libsuffix,os.binsuffix,os.binsuffixes='so','',{ '' }
+end
 local execute=os.execute
 local iopopen=io.popen
+local ostype=os.type
 local function resultof(command)
- local handle=iopopen(command,"rb") 
+ local handle=iopopen(command,ostype=="windows" and "rb" or "r")
  if handle then
   local result=handle:read("*all") or ""
   handle:close()
@@ -3982,20 +3997,6 @@ os.resultof=resultof
 function os.pipeto(command)
  return iopopen(command,"w") 
 end
-if not io.fileseparator then
- if find(os.getenv("PATH"),";",1,true) then
-  io.fileseparator,io.pathseparator,os.type="\\",";",os.type or "windows"
- else
-  io.fileseparator,io.pathseparator,os.type="/",":",os.type or "unix"
- end
-end
-os.type=os.type or (io.pathseparator==";"    and "windows") or "unix"
-os.name=os.name or (os.type=="windows" and "mswin"  ) or "linux"
-if os.type=="windows" then
- os.libsuffix,os.binsuffix,os.binsuffixes='dll','exe',{ 'exe','cmd','bat' }
-else
- os.libsuffix,os.binsuffix,os.binsuffixes='so','',{ '' }
-end
 local launchers={
  windows="start %s",
  macosx="open %s",
@@ -25896,8 +25897,8 @@ end -- of closure
 
 -- used libraries    : l-bit32.lua l-lua.lua l-macro.lua l-sandbox.lua l-package.lua l-lpeg.lua l-function.lua l-string.lua l-table.lua l-io.lua l-number.lua l-set.lua l-os.lua l-file.lua l-gzip.lua l-md5.lua l-sha.lua l-url.lua l-dir.lua l-boolean.lua l-unicode.lua l-math.lua util-str.lua util-tab.lua util-fil.lua util-sac.lua util-sto.lua util-prs.lua util-fmt.lua util-soc-imp-reset.lua util-soc-imp-socket.lua util-soc-imp-copas.lua util-soc-imp-ltn12.lua util-soc-imp-mime.lua util-soc-imp-url.lua util-soc-imp-headers.lua util-soc-imp-tp.lua util-soc-imp-http.lua util-soc-imp-ftp.lua util-soc-imp-smtp.lua trac-set.lua trac-log.lua trac-inf.lua trac-pro.lua util-lua.lua util-deb.lua util-tpl.lua util-sbx.lua util-mrg.lua util-env.lua luat-env.lua util-zip.lua lxml-tab.lua lxml-lpt.lua lxml-mis.lua lxml-aux.lua lxml-xml.lua trac-xml.lua data-ini.lua data-exp.lua data-env.lua data-tmp.lua data-met.lua data-res.lua data-pre.lua data-inp.lua data-out.lua data-fil.lua data-con.lua data-use.lua data-zip.lua data-tre.lua data-sch.lua data-lua.lua data-aux.lua data-tmf.lua data-lst.lua libs-ini.lua luat-sta.lua luat-fmt.lua
 -- skipped libraries : -
--- original bytes    : 1024297
--- stripped bytes    : 402139
+-- original bytes    : 1024388
+-- stripped bytes    : 402181
 
 -- end library merge