From f9dc65246f5d46583d00db93761929b6c6b5bf20 Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Mon, 29 May 2023 14:53:42 +0200 Subject: 2023-05-29 14:15:00 --- scripts/context/lua/mtx-install.lua | 10 +++++++--- scripts/context/lua/mtxrun.lua | 7 ++++--- scripts/context/stubs/mswin/mtxrun.lua | 7 ++++--- scripts/context/stubs/unix/mtxrun | 7 ++++--- scripts/context/stubs/win64/mtxrun.lua | 7 ++++--- 5 files changed, 23 insertions(+), 15 deletions(-) (limited to 'scripts') diff --git a/scripts/context/lua/mtx-install.lua b/scripts/context/lua/mtx-install.lua index 64200ef2e..ad2e629dc 100644 --- a/scripts/context/lua/mtx-install.lua +++ b/scripts/context/lua/mtx-install.lua @@ -63,7 +63,11 @@ local function fetch(url) data, detail = httprequest(url) end if type(data) ~= "string" then - data = false + data = false + detail = "download failed" + elseif #data == 0 then + data = false + detail = "download failed, zero length" elseif #data < 2048 then local n, t = find(data,"%s*%s*(%d+)%s(.-)") if tonumber(n) then @@ -557,8 +561,8 @@ function install.update() local cdir = currentdir() local pdir = pushdir(binpath) - report("current : %S",cdir) - report("target : %S",pdir) + report("current : %S",cdir or "") + report("target : %S",pdir or "") if pdir ~= cdir then diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index ad39c4579..64f879d48 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -11901,7 +11901,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-soc-imp-http"] = package.loaded["util-soc-imp-http"] or true --- original size: 12624, stripped down to: 9598 +-- original size: 12651, stripped down to: 9619 local tostring,tonumber,setmetatable,next,type=tostring,tonumber,setmetatable,next,type @@ -12227,6 +12227,7 @@ trequest=function(originalrequest) local code,status=connection:receivestatusline() if not code then connection:receive09body(status,request.sink,request.step) + connection:close() return 1,200 end while code==100 do @@ -26203,8 +26204,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 : 1046906 --- stripped bytes : 415976 +-- original bytes : 1046933 +-- stripped bytes : 415982 -- end library merge diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index ad39c4579..64f879d48 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -11901,7 +11901,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-soc-imp-http"] = package.loaded["util-soc-imp-http"] or true --- original size: 12624, stripped down to: 9598 +-- original size: 12651, stripped down to: 9619 local tostring,tonumber,setmetatable,next,type=tostring,tonumber,setmetatable,next,type @@ -12227,6 +12227,7 @@ trequest=function(originalrequest) local code,status=connection:receivestatusline() if not code then connection:receive09body(status,request.sink,request.step) + connection:close() return 1,200 end while code==100 do @@ -26203,8 +26204,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 : 1046906 --- stripped bytes : 415976 +-- original bytes : 1046933 +-- stripped bytes : 415982 -- end library merge diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index ad39c4579..64f879d48 100644 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -11901,7 +11901,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-soc-imp-http"] = package.loaded["util-soc-imp-http"] or true --- original size: 12624, stripped down to: 9598 +-- original size: 12651, stripped down to: 9619 local tostring,tonumber,setmetatable,next,type=tostring,tonumber,setmetatable,next,type @@ -12227,6 +12227,7 @@ trequest=function(originalrequest) local code,status=connection:receivestatusline() if not code then connection:receive09body(status,request.sink,request.step) + connection:close() return 1,200 end while code==100 do @@ -26203,8 +26204,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 : 1046906 --- stripped bytes : 415976 +-- original bytes : 1046933 +-- stripped bytes : 415982 -- end library merge diff --git a/scripts/context/stubs/win64/mtxrun.lua b/scripts/context/stubs/win64/mtxrun.lua index ad39c4579..64f879d48 100644 --- a/scripts/context/stubs/win64/mtxrun.lua +++ b/scripts/context/stubs/win64/mtxrun.lua @@ -11901,7 +11901,7 @@ do -- create closure to overcome 200 locals limit package.loaded["util-soc-imp-http"] = package.loaded["util-soc-imp-http"] or true --- original size: 12624, stripped down to: 9598 +-- original size: 12651, stripped down to: 9619 local tostring,tonumber,setmetatable,next,type=tostring,tonumber,setmetatable,next,type @@ -12227,6 +12227,7 @@ trequest=function(originalrequest) local code,status=connection:receivestatusline() if not code then connection:receive09body(status,request.sink,request.step) + connection:close() return 1,200 end while code==100 do @@ -26203,8 +26204,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 : 1046906 --- stripped bytes : 415976 +-- original bytes : 1046933 +-- stripped bytes : 415982 -- end library merge -- cgit v1.2.3