izaya
/
OC-PsychOS
2
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

made luash nicer to use

This commit is contained in:
Izaya 2017-08-04 17:44:37 +10:00
parent e341ada43e
commit 219d3a8326
3 changed files with 42 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
modules/applications/luash.lua
View File

@ -5,10 +5,41 @@ spawn("lua shell",function()
while true do
write((os.getenv("PWD") or "").."> ")
local inp=readln()
if inp:sub(1,1) == "=" then inp="return "..inp:sub(2) end
local r={pcall(load(inp))}
if r[1] == true then table.remove(r,1) end
print(table.unpack(r))
if inp:sub(1,1) == "!" then
local pth = os.getenv("PATH") or "."
local s,ptt = inp:sub(2), {}
for w in s:gmatch("%S+") do table.insert(ptt,w) end
local prg = table.remove(ptt,1)
for d in pth:gmatch("[^:]+") do
_,lex = pcall(fs.exists,d.."/"..prg..".lua")
_,nex = pcall(fs.exists,d.."/"..prg)
if lex then
run(d.."/"..prg..".lua",table.unpack(ptt))
break
elseif nex then
run(d.."/"..prg,table.unpack(ptt))
break
end
end
elseif inp:sub(1,1) == "$" then
local s,ptt = inp:sub(2), {}
for w in s:gmatch("%S+") do table.insert(ptt,w) end
local prg = table.remove(ptt,1)
local r={pcall(_ENV[prg],table.unpack(ptt))}
if r[1] == true then
table.remove(r,1)
end
print(table.unpack(r))
else
if inp:sub(1,1) == "=" then
inp="return "..inp:sub(2)
end
local r={pcall(load(inp))}
if r[1] == true then
table.remove(r,1)
end
print(table.unpack(r))
end
end
end,si)
end

4
modules/base/header.lua
View File

@ -20,9 +20,9 @@ do -- so local works
tT[nP].n = n
tT[nP].p = cT or -1
if tT[cT] then
tT[nP].u,tT[nP].ep,tT[nP].e = tT[cT].u,tT[cT].ep,e or tT[cT].e or {}
tT[nP].u,tT[nP].ep,tT[nP].e = tT[cT].u,tT[cT].ep,e or tT[cT].e or {["PWD"]="/boot",["PATH"]="/boot/exec:."}
else
tT[nP].u,tT[nP].ep,tT[nP].e = "superuser",1,{}
tT[nP].u,tT[nP].ep,tT[nP].e = "superuser",1,{["PWD"]="/boot",["PATH"]="/boot/exec:."}
end
nP = nP + 1
end

6
modules/lib/shutil.lua
View File

@ -32,7 +32,11 @@ function loadfile(fn)
return load(S)
end
function run(fn,...)
print(pcall(loadfile(fn),...))
local r = {pcall(loadfile(fn),...)}
if r[1] == true then
table.remove(r,1)
end
print(table.unpack(r))
end
function srun(fn,...)
spawn(fn,print(pcall(loadfile(fn),...)))