From 5d4880ac91b0e605b3392d15dd7572489b92333e Mon Sep 17 00:00:00 2001 From: Hans Hagen Date: Fri, 16 Apr 2010 21:08:00 +0200 Subject: beta 2010.04.16 21:08 --- scripts/context/lua/luatools.lua | 6 +++--- scripts/context/lua/mtxrun.lua | 7 ++++--- scripts/context/stubs/mswin/luatools.lua | 6 +++--- scripts/context/stubs/mswin/mtxrun.lua | 7 ++++--- scripts/context/stubs/unix/luatools | 6 +++--- scripts/context/stubs/unix/mtxrun | 7 ++++--- 6 files changed, 21 insertions(+), 18 deletions(-) (limited to 'scripts') diff --git a/scripts/context/lua/luatools.lua b/scripts/context/lua/luatools.lua index 2a6e904fe..35a61ea43 100644 --- a/scripts/context/lua/luatools.lua +++ b/scripts/context/lua/luatools.lua @@ -450,7 +450,7 @@ function string:checkedsplit(separator) return match(c,self) end ---~ function lpeg.L(list,pp) +--~ function lpeg.append(list,pp) --~ local p = pp --~ for l=1,#list do --~ if p then @@ -1777,12 +1777,13 @@ end --~ print(os.date("%H:%M:%S",os.time())) -- no need for function anymore as we have more clever code and helpers now +-- this metatable trickery might as well disappear os.resolvers = os.resolvers or { } local resolvers = os.resolvers -local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } +local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } -- maybe nil local osix = osmt.__index osmt.__index = function(t,k) @@ -5280,7 +5281,6 @@ resolvers.ownbin = gsub(resolvers.ownbin,"\\","/") function resolvers.getownpath() local ownpath = resolvers.ownpath or os.selfdir -print(ownpath,os.selfdir) if not ownpath or ownpath == "" or ownpath == "unset" then ownpath = args[-1] or arg[-1] ownpath = ownpath and file.dirname(gsub(ownpath,"\\","/")) diff --git a/scripts/context/lua/mtxrun.lua b/scripts/context/lua/mtxrun.lua index d3942f7b3..f76aa724b 100644 --- a/scripts/context/lua/mtxrun.lua +++ b/scripts/context/lua/mtxrun.lua @@ -459,7 +459,7 @@ function string:checkedsplit(separator) return match(c,self) end ---~ function lpeg.L(list,pp) +--~ function lpeg.append(list,pp) --~ local p = pp --~ for l=1,#list do --~ if p then @@ -1786,12 +1786,13 @@ end --~ print(os.date("%H:%M:%S",os.time())) -- no need for function anymore as we have more clever code and helpers now +-- this metatable trickery might as well disappear os.resolvers = os.resolvers or { } local resolvers = os.resolvers -local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } +local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } -- maybe nil local osix = osmt.__index osmt.__index = function(t,k) @@ -8370,7 +8371,7 @@ resolvers.ownbin = gsub(resolvers.ownbin,"\\","/") function resolvers.getownpath() local ownpath = resolvers.ownpath or os.selfdir - if not ownpath or ownpath == "" then + if not ownpath or ownpath == "" or ownpath == "unset" then ownpath = args[-1] or arg[-1] ownpath = ownpath and file.dirname(gsub(ownpath,"\\","/")) if not ownpath or ownpath == "" then diff --git a/scripts/context/stubs/mswin/luatools.lua b/scripts/context/stubs/mswin/luatools.lua index 2a6e904fe..35a61ea43 100644 --- a/scripts/context/stubs/mswin/luatools.lua +++ b/scripts/context/stubs/mswin/luatools.lua @@ -450,7 +450,7 @@ function string:checkedsplit(separator) return match(c,self) end ---~ function lpeg.L(list,pp) +--~ function lpeg.append(list,pp) --~ local p = pp --~ for l=1,#list do --~ if p then @@ -1777,12 +1777,13 @@ end --~ print(os.date("%H:%M:%S",os.time())) -- no need for function anymore as we have more clever code and helpers now +-- this metatable trickery might as well disappear os.resolvers = os.resolvers or { } local resolvers = os.resolvers -local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } +local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } -- maybe nil local osix = osmt.__index osmt.__index = function(t,k) @@ -5280,7 +5281,6 @@ resolvers.ownbin = gsub(resolvers.ownbin,"\\","/") function resolvers.getownpath() local ownpath = resolvers.ownpath or os.selfdir -print(ownpath,os.selfdir) if not ownpath or ownpath == "" or ownpath == "unset" then ownpath = args[-1] or arg[-1] ownpath = ownpath and file.dirname(gsub(ownpath,"\\","/")) diff --git a/scripts/context/stubs/mswin/mtxrun.lua b/scripts/context/stubs/mswin/mtxrun.lua index d3942f7b3..f76aa724b 100644 --- a/scripts/context/stubs/mswin/mtxrun.lua +++ b/scripts/context/stubs/mswin/mtxrun.lua @@ -459,7 +459,7 @@ function string:checkedsplit(separator) return match(c,self) end ---~ function lpeg.L(list,pp) +--~ function lpeg.append(list,pp) --~ local p = pp --~ for l=1,#list do --~ if p then @@ -1786,12 +1786,13 @@ end --~ print(os.date("%H:%M:%S",os.time())) -- no need for function anymore as we have more clever code and helpers now +-- this metatable trickery might as well disappear os.resolvers = os.resolvers or { } local resolvers = os.resolvers -local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } +local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } -- maybe nil local osix = osmt.__index osmt.__index = function(t,k) @@ -8370,7 +8371,7 @@ resolvers.ownbin = gsub(resolvers.ownbin,"\\","/") function resolvers.getownpath() local ownpath = resolvers.ownpath or os.selfdir - if not ownpath or ownpath == "" then + if not ownpath or ownpath == "" or ownpath == "unset" then ownpath = args[-1] or arg[-1] ownpath = ownpath and file.dirname(gsub(ownpath,"\\","/")) if not ownpath or ownpath == "" then diff --git a/scripts/context/stubs/unix/luatools b/scripts/context/stubs/unix/luatools index 2a6e904fe..35a61ea43 100755 --- a/scripts/context/stubs/unix/luatools +++ b/scripts/context/stubs/unix/luatools @@ -450,7 +450,7 @@ function string:checkedsplit(separator) return match(c,self) end ---~ function lpeg.L(list,pp) +--~ function lpeg.append(list,pp) --~ local p = pp --~ for l=1,#list do --~ if p then @@ -1777,12 +1777,13 @@ end --~ print(os.date("%H:%M:%S",os.time())) -- no need for function anymore as we have more clever code and helpers now +-- this metatable trickery might as well disappear os.resolvers = os.resolvers or { } local resolvers = os.resolvers -local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } +local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } -- maybe nil local osix = osmt.__index osmt.__index = function(t,k) @@ -5280,7 +5281,6 @@ resolvers.ownbin = gsub(resolvers.ownbin,"\\","/") function resolvers.getownpath() local ownpath = resolvers.ownpath or os.selfdir -print(ownpath,os.selfdir) if not ownpath or ownpath == "" or ownpath == "unset" then ownpath = args[-1] or arg[-1] ownpath = ownpath and file.dirname(gsub(ownpath,"\\","/")) diff --git a/scripts/context/stubs/unix/mtxrun b/scripts/context/stubs/unix/mtxrun index d3942f7b3..f76aa724b 100755 --- a/scripts/context/stubs/unix/mtxrun +++ b/scripts/context/stubs/unix/mtxrun @@ -459,7 +459,7 @@ function string:checkedsplit(separator) return match(c,self) end ---~ function lpeg.L(list,pp) +--~ function lpeg.append(list,pp) --~ local p = pp --~ for l=1,#list do --~ if p then @@ -1786,12 +1786,13 @@ end --~ print(os.date("%H:%M:%S",os.time())) -- no need for function anymore as we have more clever code and helpers now +-- this metatable trickery might as well disappear os.resolvers = os.resolvers or { } local resolvers = os.resolvers -local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } +local osmt = getmetatable(os) or { __index = function(t,k) t[k] = "unset" return "unset" end } -- maybe nil local osix = osmt.__index osmt.__index = function(t,k) @@ -8370,7 +8371,7 @@ resolvers.ownbin = gsub(resolvers.ownbin,"\\","/") function resolvers.getownpath() local ownpath = resolvers.ownpath or os.selfdir - if not ownpath or ownpath == "" then + if not ownpath or ownpath == "" or ownpath == "unset" then ownpath = args[-1] or arg[-1] ownpath = ownpath and file.dirname(gsub(ownpath,"\\","/")) if not ownpath or ownpath == "" then -- cgit v1.2.3